Skip to content

Commit

Permalink
Merge pull request #30 from sippy-platform/0.13
Browse files Browse the repository at this point in the history
Mellow UI 0.13.4
  • Loading branch information
Studio384 authored Aug 19, 2022
2 parents c3da860 + def26e1 commit 9d5b4cf
Show file tree
Hide file tree
Showing 10 changed files with 445 additions and 465 deletions.
839 changes: 431 additions & 408 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sippy-platform/mellow-ui",
"version": "0.13.3",
"version": "0.13.4",
"description": "React components for the Mellow Design System.",
"main": "./dist/mellow-ui.umd.js",
"module": "./dist/mellow-ui.es.js",
Expand Down Expand Up @@ -34,19 +34,19 @@
"@headlessui/react": "1.6.6",
"clsx": "1.2.1",
"react-element-to-jsx-string": "15.0.0",
"sass": "1.53.0"
"sass": "1.54.4"
},
"devDependencies": {
"@types/node": "18.0.6",
"@types/react": "18.0.15",
"@types/node": "18.7.6",
"@types/react": "18.0.17",
"@types/react-dom": "18.0.6",
"@vitejs/plugin-react": "2.0.0",
"@vitejs/plugin-react": "2.0.1",
"hast-to-hyperscript": "10.0.1",
"react-router-dom": "6.3.0",
"refractor": "4.7.0",
"typescript": "4.7.4",
"vite": "3.0.2",
"vite-plugin-dts": "1.4.0"
"vite": "3.0.8",
"vite-plugin-dts": "1.4.1"
},
"peerDependencies": {
"@sippy-platform/mellow-css": ">=0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/InputControl/InputControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const InputControl = ({
const uniqueName = name ?? id;

return (
<>
<div>
<div className="form-floating">
<input
name={uniqueName}
Expand All @@ -85,7 +85,7 @@ export const InputControl = ({
{helper}
</div>
)}
</>
</div>
);
};

Expand Down
7 changes: 0 additions & 7 deletions src/components/Menu/Menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ import { ReactNode } from 'react';

import { Menu as MenuPrimitive } from '@headlessui/react';

import clsx from 'clsx';

export interface MenuProps {
/**
* The open state
*/
open: boolean;
/**
* The contents of the dialog
*/
Expand All @@ -19,7 +13,6 @@ export interface MenuProps {
* Primary UI component for user interaction
*/
export const Menu = ({
open,
children,
...props
}: MenuProps) => {
Expand Down
6 changes: 0 additions & 6 deletions src/components/MenuTrigger/MenuTrigger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { Menu as MenuPrimitive } from '@headlessui/react';

import clsx from 'clsx';


export interface MenuTriggerProps {
/**
* The open state
*/
open: boolean;
/**
* Custom classes for the label
*/
Expand All @@ -24,7 +19,6 @@ export interface MenuTriggerProps {
* Primary UI component for user interaction
*/
export const MenuTrigger = ({
open,
children,
className,
...props
Expand Down
4 changes: 2 additions & 2 deletions src/components/SelectControl/SelectControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const SelectControl = ({
);

return (
<>
<div>
<div className="form-floating">
<Listbox
value={value}
Expand Down Expand Up @@ -146,7 +146,7 @@ export const SelectControl = ({
{helper}
</div>
)}
</>
</div>
);
};

Expand Down
30 changes: 0 additions & 30 deletions src/docs/pages/Components/PivotDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,6 @@ export default function PivotDemo() {
</PivotPanels>
</Pivot>
</DemoBox>
<h3>Pills</h3>
<DemoBox>
<Pivot>
<PivotNav variant="pills">
<PivotItem>Tab 1</PivotItem>
<PivotItem>Tab 2</PivotItem>
<PivotItem>Tab 3</PivotItem>
</PivotNav>
<PivotPanels>
<PivotPanel>Content 1</PivotPanel>
<PivotPanel>Content 2</PivotPanel>
<PivotPanel>Content 3</PivotPanel>
</PivotPanels>
</Pivot>
</DemoBox>
<h3>Underline</h3>
<DemoBox>
<Pivot>
<PivotNav variant="underline">
<PivotItem>Tab 1</PivotItem>
<PivotItem>Tab 2</PivotItem>
<PivotItem>Tab 3</PivotItem>
</PivotNav>
<PivotPanels>
<PivotPanel>Content 1</PivotPanel>
<PivotPanel>Content 2</PivotPanel>
<PivotPanel>Content 3</PivotPanel>
</PivotPanels>
</Pivot>
</DemoBox>
</>
);
}
2 changes: 1 addition & 1 deletion src/docs/pages/Forms/FormControlDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function FormControlDemo() {

<h3>Input Control</h3>
<DemoBox>
<Grid>
<Grid xs={1}>
<InputControl name="default" label="Default" placeholder="Default" helper="A default text field." />
<InputControl name="email" type="email" label="Email" placeholder="Email" />
<InputControl name="password" type="password" label="Password" placeholder="Password" />
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Forms/InputDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function InputDemo() {
<>
<h2>Input</h2>
<DemoBox>
<Grid>
<Grid xs={1}>
<Input placeholder="Default" />
<Input type="email" placeholder="Email" />
<Input type="password" placeholder="Password" />
Expand Down
2 changes: 1 addition & 1 deletion src/docs/pages/Forms/InputGroupDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function InputGroupDemo() {
<h3>Input Addon</h3>
<p>The input group allows you to add input addons to an input. These are small text labels.</p>
<DemoBox>
<Grid>
<Grid xs={1}>
<InputGroup>
<InputAddon>Prefix</InputAddon>
<Input placeholder="Default" />
Expand Down

0 comments on commit 9d5b4cf

Please sign in to comment.