Skip to content

Commit

Permalink
Merge pull request #28 from sippy-platform/0.13
Browse files Browse the repository at this point in the history
Mellow UI 0.13.2
  • Loading branch information
Studio384 authored Jul 22, 2022
2 parents ed0b411 + 16cecc9 commit a9678f0
Show file tree
Hide file tree
Showing 38 changed files with 40 additions and 220 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sippy-platform/mellow-ui",
"version": "0.13.1",
"version": "0.13.2",
"description": "React components for the Mellow Design System.",
"main": "./dist/mellow-ui.umd.js",
"module": "./dist/mellow-ui.es.js",
Expand Down
4 changes: 2 additions & 2 deletions src/components/InputControl/InputControl.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import clsx from "clsx";
import { InputHTMLAttributes } from "react";
import { InputLabel } from "..";

import InputLabel from "../InputLabel";

export interface InputControlProps {
/**
Expand Down
6 changes: 3 additions & 3 deletions src/components/SelectControl/SelectControl.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { ReactNode, Fragment, useMemo } from "react";

import { InputLabel } from "..";
import InputLabel from "../InputLabel";
import SelectItem from "../SelectItem";

import { Listbox, Transition } from "@headlessui/react";

import clsx from "clsx";
import ValkyrieIcon, { viAngleDown } from "@sippy-platform/valkyrie";
import SelectItem from "../SelectItem";

export interface SelectControlProps {
/**
Expand Down Expand Up @@ -137,7 +137,7 @@ export const SelectControl = ({
</Listbox.Options>
</Transition>
</Listbox>
<InputLabel id={uniqueName} shrink={!!value}>
<InputLabel id={uniqueName} shrink={value !== undefined || value !== null}>
{label}
</InputLabel>
</div>
Expand Down
181 changes: 0 additions & 181 deletions src/components/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/docs/components/DemoBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { refractor } from 'refractor';
import { toH } from 'hast-to-hyperscript';
import reactElementToJSXString from 'react-element-to-jsx-string';

import { Card, CardBody } from '@components';
import { Card, CardBody } from '@';

export default function DemoBox({ children }) {
const componentString = reactElementToJSXString(children);
Expand Down
2 changes: 1 addition & 1 deletion src/docs/components/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Link, useNavigate } from "react-router-dom";
import { Container, List, ListItem } from "@components";
import { Container, List, ListItem } from "@";

import './layout.scss';

Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/AlertDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from '@docs/components/DemoBox';

import { Alert, AlertTitle } from '@components';
import { Alert, AlertTitle } from '@';

export default function AlertDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/AvatarDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from '@docs/components/DemoBox';

import { Avatar } from '@components';
import { Avatar } from '@';
import ValkyrieIcon, { viUser } from '@sippy-platform/valkyrie';

export default function AvatarDemo() {
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/BottomBarDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from '@docs/components/DemoBox';

import { BottomBar, BottomBarItem } from '@components';
import { BottomBar, BottomBarItem } from '@';
import ValkyrieIcon, { viEllipsis, viGear, viHouse, viSippy, viUser, viValkyrieSword } from '@sippy-platform/valkyrie';

export default function BottomBarDemo() {
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/BreadcrumbDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from '@docs/components/DemoBox';

import { Breadcrumb, BreadcrumbItem } from '@components';
import { Breadcrumb, BreadcrumbItem } from '@';
import ValkyrieIcon, { viHouse } from '@sippy-platform/valkyrie';

export default function BreadcrumbDemo() {
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/ButtonDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Button } from "@components";
import { Button } from "@";

export default function ButtonDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/ButtonGroupDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Button, ButtonGroup } from "@components";
import { Button, ButtonGroup } from "@";

export default function ButtonGroupDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/CardDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
CardHeader,
CardLink,
CardTitle,
} from "@components";
} from "@";

export default function CardDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/DialogDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
DialogBody,
DialogFooter,
DialogHeader,
} from "@components";
} from "@";

export default function DialogDemo() {
const [open, setOpen] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/DropdownDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Button,
Dropdown,
DropdownItem
} from "@components";
} from "@";

export default function DropdownDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/LabelDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Label } from "@components";
import { Label } from "@";

export default function LabelDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/ListDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from "react";

import DemoBox from "@docs/components/DemoBox";

import { Radio, List, ListItem, ListItemDivider } from "@components";
import { Radio, List, ListItem, ListItemDivider } from "@";
import ValkyrieIcon, { viHouse } from "@sippy-platform/valkyrie";
import { RadioGroup } from "@headlessui/react";

Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/MenuDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Menu, MenuItem, MenuItems, MenuTrigger } from "@components";
import { Menu, MenuItem, MenuItems, MenuTrigger } from "@";

export default function MenuDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/NavDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Nav, NavItem } from "@components";
import { Nav, NavItem } from "@";

export default function NavDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/OffcanvasDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Offcanvas,
OffcanvasBody,
OffcanvasHeader,
} from "@components";
} from "@";

export default function OffcanvasDemo() {
const [canvas, setCanvas] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/PivotDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Pivot, PivotItem, PivotNav, PivotPanel, PivotPanels } from "@components";
import { Pivot, PivotItem, PivotNav, PivotPanel, PivotPanels } from "@";

export default function PivotDemo() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/PlaceholderDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
CardTitle,
Grid,
Placeholder,
} from "@components";
} from "@";

export default function PlaceholderDemo() {
const [open, setOpen] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Components/ProgressDemo.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DemoBox from "@docs/components/DemoBox";

import { Progress } from "@components";
import { Progress } from "@";

export default function ProgressDemo() {
return (
Expand Down
Loading

0 comments on commit a9678f0

Please sign in to comment.