react-miui 0.8.0 → 0.9.3

package/esm/utils/toObjectValue.js

@@ -0,0 +1,5 @@
+const toObjectValue = (s) => {
+    return typeof s === "string" ? { value: s, label: s } : s;
+};
+export { toObjectValue, };
+//# sourceMappingURL=toObjectValue.js.map

package/esm/utils/toObjectValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"toObjectValue.js","sourceRoot":"","sources":["../../src/utils/toObjectValue.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAe,EAAE;IAC5C,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,OAAO,EACH,aAAa,GAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-miui",
-  "version": "0.8.0",
+  "version": "0.9.3",
   "author": "Jacek Nowacki",
   "license": "MIT",
   "scripts": {
@@ -13,7 +13,7 @@
     "lint": "eslint src --ext .ts,.tsx,.js,.jsx,.mjs",
     "lint:fix": "yarn lint --fix",
     "prepack": "yarn compile",
-    "prepublishOnly": "yarn lint && yarn test && yarn docs",
+    "prepublishOnly": "yarn audit && yarn lint && yarn test && yarn docs",
     "start:dev": "next dev",
     "deploy:dev": "next build && next export && netlify deploy --dir out"
   },
@@ -48,16 +48,16 @@
     "eslint-plugin-react": "^7.24.0",
     "fast-glob": "^3.2.7",
     "fs-extra": "^9.0.1",
-    "husky": "^4.3.0",
-    "jest": "^27.0.6",
+    "husky": "^7.0.4",
+    "jest": "^27.5.1",
     "must": "^0.13.4",
-    "next": "^11.1.3",
+    "next": "^11.1.4",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-use": "^17.2.4",
     "sass": "^1.35.2",
     "ts-node": "^9.0.0",
-    "typedoc": "^0.21.2",
+    "typedoc": "^0.21.10",
     "typedoc-plugin-pages-fork-fork": "^0.0.3",
     "typescript": "^4.2.4"
   },
@@ -71,7 +71,7 @@
     }
   },
   "libraryTemplate": {
-    "version": "3.4.0",
+    "version": "3.4.1",
     "language": "typescript",
     "fixDefaultForCommonJS": true,
     "jsx": true

package/src/components/form/Checkbox.module.scss

@@ -6,42 +6,66 @@
         margin: 0;
         vertical-align: middle;
 
-        + span {
-            border-radius: 100px;
-            background: var(--inactive-bg);
-            width: 18px;
-            height: 18px;
-            display: inline-flex;
-            justify-content: center;
-            align-items: center;
-            vertical-align: middle;
-
-            svg {
-                width: 9px;
-                height: 9px;
-                fill: white;
-            }
-
-            + span {
-                vertical-align: middle;
-            }
-        }
-
         &:focus-visible {
-            + span {
+            + .checkmark {
                 box-shadow: 0 0 5px black;
             }
         }
 
-        &:checked {
-            + span {
-                color: var(--main-color);
-                background: currentColor;
-            }
+        + .checkmark + .label:not(:empty) {
+            margin-left: 0.75em;
         }
+    }
+}
 
-        + span + span:not(:empty) {
-            margin-left: 0.5em;
-        }
+.checkmark {
+    border-radius: 100px;
+    background: none;
+    border: 1px solid var(--inactive-bg);
+    width: 18px;
+    height: 18px;
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+    vertical-align: middle;
+    box-sizing: border-box;
+
+    svg {
+        display: none;
+        width: 9px;
+        height: 9px;
+        fill: white;
+    }
+
+    + .label {
+        vertical-align: middle;
+    }
+}
+
+.checkmarkChecked {
+    border-width: 0;
+    color: var(--main-color);
+    background: currentColor;
+
+    svg {
+        display: inline-block;
+    }
+
+    &.checkmarkDisabled {
+        background: var(--inactive-dark-bg);
+    }
+}
+
+.checkmarkDisabled {
+    background: var(--active-bg);
+
+    + .label {
+        color: var(--input-disabled-text);
+    }
+}
+
+.checkmarkReadOnly {
+    + .label {
+        color: var(--input-disabled-text);
     }
 }

package/src/components/form/Checkbox.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import classnames from "classnames";
 
 import styles from "./Checkbox.module.scss";
 import { Checkmark } from "../icons/Checkmark.js";
@@ -8,17 +9,37 @@ interface Props {
     name: string;
     onChange: () => void;
     checked: boolean;
+    disabled?: boolean;
+    readOnly?: boolean;
 }
 
 const Checkbox: React.FC<Props> = (props) => {
     const style: React.CSSProperties = {};
     props.color && (style.color = props.color);
 
+    const cls = classnames(styles.checkbox, {
+        [styles.disabled]: props.disabled,
+        [styles.readOnly]: props.readOnly,
+    });
+
+    const checkmarkCls = classnames(styles.checkmark, {
+        [styles.checkmarkDisabled]: props.disabled,
+        [styles.checkmarkChecked]: props.checked,
+        [styles.checkmarkReadOnly]: props.readOnly,
+    });
+
     return (
-        <label className={styles.checkbox}>
-            <input type={"checkbox"} name={props.name} onChange={props.onChange} checked={props.checked} />
-            <span style={style}><Checkmark /></span>
-            <span>{props.children}</span>
+        <label className={cls}>
+            <input
+                type={"checkbox"}
+                name={props.name}
+                onChange={props.onChange}
+                checked={props.checked}
+                disabled={props.disabled}
+                readOnly={props.readOnly}
+            />
+            <span style={style} className={checkmarkCls}><Checkmark /></span>
+            <span className={styles.label}>{props.children}</span>
         </label>
     );
 };

package/src/components/form/Input.module.scss

@@ -24,6 +24,27 @@
     padding: 0 calc(36px / var(--ratio-dimensions));
     border: calc(1px / var(--ratio-border)) solid var(--border);
     align-items: center;
+
+    .input {
+        flex: 1;
+    }
+
+    &.disabled {
+        background: var(--input-disabled-bg);
+        color: var(--input-disabled-text);
+
+        .input {
+            color: var(--input-disabled-text);
+        }
+    }
+
+    &.readOnly {
+        color: var(--input-disabled-text);
+
+        .input {
+            color: var(--input-disabled-text);
+        }
+    }
 }
 
 .textarea {

package/src/components/form/Input.tsx

@@ -29,6 +29,8 @@ const Input: React.FC<Omit<React.InputHTMLAttributes<HTMLInputElement>, "prefix"
 
     const wrapperCls = classnames(styles.wrapper, {
         [styles.wrapperFocused]: focused,
+        [styles.disabled]: props.disabled,
+        [styles.readOnly]: props.readOnly,
     }, className);
 
     const prefixElem = prefix ? <div className={styles.prefix}>{prefix}</div> : null;

package/src/components/form/choice/Choice.module.scss

@@ -0,0 +1,43 @@
+.choice {
+    input {
+        width: 0;
+        height: 0;
+        overflow: hidden;
+        opacity: 0;
+        margin: 0;
+        position: absolute;
+
+        &:checked + span {
+            color: var(--choice-active-text);
+            background: var(--choice-active-bg);
+        }
+    }
+
+    span {
+        display: flex;
+        padding: 0;
+        flex: 1;
+        height: 100%;
+        align-items: center;
+        justify-content: center;
+        font-size: calc(24px / var(--ratio-font));
+        color: var(--choice-text);
+        background: var(--choice-bg);
+    }
+
+    display: flex;
+    border: 1px solid var(--choice-border); // @TODO width
+    position: relative;
+    border-radius: 8px;
+    overflow: hidden;
+
+    label {
+        flex: 1;
+        height: calc(89px / var(--ratio-dimensions));
+        display: flex;
+
+        + label {
+            border-left: 1px solid var(--choice-border);
+        }
+    }
+}

package/src/components/form/choice/Choice.tsx

@@ -0,0 +1,32 @@
+import React from "react";
+
+import type { Value } from "../../../types/form";
+import { toObjectValue } from "../../../utils";
+import { ChoiceItem } from "./ChoiceItem";
+import styles from "./Choice.module.scss";
+
+interface Props {
+    values: Value[];
+    value: string;
+    name: string;
+    onChange: (value: string) => void;
+}
+
+const Choice: React.FC<Props> = (props) => {
+    const opts = props.values.map(option => {
+        const opt = toObjectValue(option);
+        return (
+            <ChoiceItem
+                key={opt.value}
+                name={props.name}
+                value={opt}
+                onChange={props.onChange}
+                active={props.value === opt.value}
+            />
+        );
+    });
+
+    return <div className={styles.choice}>{opts}</div>;
+};
+
+export { Choice };

package/src/components/form/choice/ChoiceItem.tsx

@@ -0,0 +1,30 @@
+import React, { useCallback } from "react";
+import type { ObjectValue } from "../../../types/form";
+
+interface Props {
+    name: string;
+    value: ObjectValue;
+    onChange: (value: string) => void;
+    active: boolean;
+}
+
+const ChoiceItem: React.FC<Props> = (props) => {
+    const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+        props.onChange(e.currentTarget.value);
+    }, [props.onChange]);
+
+    return (
+        <label key={props.value.value} tabIndex={0}>
+            <input
+                type={"radio"}
+                name={props.name}
+                value={props.value.value}
+                checked={props.active}
+                onChange={handleChange}
+            />
+            <span>{props.value.label}</span>
+        </label>
+    );
+};
+
+export { ChoiceItem };

package/src/components/layout/list/Header.tsx

@@ -1,20 +1,21 @@
 import React from "react";
 import classnames from "classnames";
 
+import { makeVariants } from "../../../utils/makeVariants";
 import styles from "./Item.module.scss";
 import headerStyles from "./Header.module.scss";
-import { makeVariants } from "../../../utils/makeVariants";
 
 type Variant = "inset";
 
 interface Props {
+    className?: string;
     variant?: Variant | Variant[];
 }
 
 const Header: React.FC<Props> = (props) => {
     const v = makeVariants(props.variant);
 
-    const cls = classnames(styles.item, headerStyles.header, {
+    const cls = classnames(props.className, styles.item, headerStyles.header, {
         [styles.inset]: v.includes("inset"),
     });
 

package/src/components/layout/list/Label.tsx

@@ -1,17 +1,19 @@
 import React from "react";
+import classnames from "classnames";
 import type { ReactNode } from "react";
 
 import styles from "./Label.module.scss";
 
 interface Props {
     sub?: ReactNode;
+    className?: string;
 }
 
 const Label: React.FC<Props> = (props) => {
     const sub = props.sub ? <div className={styles.sub}>{props.sub}</div> : null;
 
     return (
-        <div className={styles.root}>
+        <div className={classnames(styles.root, props.className)}>
             <div>{props.children}</div>
             {sub}
         </div>

package/src/components/layout/list/List.tsx

@@ -30,13 +30,12 @@ const List: React.FC<Props> & SubComponents = (props) => {
         return child;
     });
 
+    const cls = classnames(props.className, styles.list, {
+        [styles.inset]: v.includes("inset"),
+    });
+
     return (
-        <ul
-            className={classnames(styles.list, {
-                [styles.inset]: v.includes("inset"),
-            })}
-        >{chld}
-        </ul>
+        <ul className={cls}>{chld}</ul>
     );
 };
 

package/src/components/layout/list/Value.tsx

@@ -1,10 +1,15 @@
 import React from "react";
+import classnames from "classnames";
 
 import styles from "./Value.module.scss";
 
-const Value: React.FC = (props) => {
+interface Props {
+    className?: string;
+}
+
+const Value: React.FC<Props> = (props) => {
     return (
-        <div className={styles.value}>{props.children}</div>
+        <div className={classnames(styles.value, props.className)}>{props.children}</div>
     );
 };
 

package/src/components/ui/tabs/Item.module.scss

@@ -0,0 +1,11 @@
+.button {
+    border: none;
+    padding: 0;
+    font-size: calc(29px / var(--ratio-font));
+    color: var(--selector-text);
+    background: none;
+}
+
+.active {
+    color: var(--selector-active);
+}

package/src/components/ui/tabs/Item.tsx

@@ -0,0 +1,26 @@
+import React, { useCallback } from "react";
+import classnames from "classnames";
+
+import type { ObjectValue } from "../../../types/form";
+
+import styles from "./Item.module.scss";
+
+interface Props {
+    value: ObjectValue;
+    onClick: (value: string) => void;
+    active: boolean;
+}
+
+const Item: React.FC<Props> = (props) => {
+    const handleClick = useCallback(() => {
+        props.onClick(props.value.value);
+    }, [props.onClick, props.value.value, props.value.label]);
+
+    const cls = classnames(styles.button, {
+        [styles.active]: props.active,
+    });
+
+    return <button onClick={handleClick} className={cls} type={"button"}>{props.value.label}</button>;
+};
+
+export { Item };

package/src/components/ui/tabs/Selector.module.scss

@@ -0,0 +1,6 @@
+.selector {
+    display: flex;
+    flex: 1;
+    justify-content: center;
+    gap: calc(114px / var(--ratio-dimensions));
+}

package/src/components/ui/tabs/Selector.tsx

@@ -0,0 +1,31 @@
+import React, { useCallback, useState } from "react";
+
+import type { Value } from "../../../types/form";
+import { toObjectValue } from "../../../utils";
+import { Item } from "./Item";
+import styles from "./Selector.module.scss";
+
+interface Props {
+    values: Value[];
+    value?: string;
+    onChange?: (value: string) => void;
+}
+
+const Selector: React.FC<Props> = (props) => {
+    const [current, setCurrent] = useState(props.value);
+
+    const handleCurrent = useCallback((value: string) => {
+        setCurrent(value);
+        props.onChange?.(value);
+    }, [props.onChange]);
+
+    const crr = props.value ?? current;
+
+    const vals = props.values.map(v => {
+        const ov = toObjectValue(v);
+        return <Item key={ov.value} value={ov} onClick={handleCurrent} active={crr === ov.value} />;
+    });
+    return <div className={styles.selector}>{vals}</div>;
+};
+
+export { Selector };

package/src/demo/components/form/Checkbox.tsx

@@ -2,13 +2,31 @@ import React, { useCallback, useState } from "react";
 
 import { Checkbox } from "../../../index.js";
 
+const handleChangeNoop = () => undefined;
+
 const CheckboxDemo: React.FC = (props) => {
     const [v, setV] = useState(false);
 
     const handleToggle = useCallback(() => { setV((prevV) => !prevV); }, []);
 
     return (
-        <Checkbox name={"a"} onChange={handleToggle} checked={v}>I want something something</Checkbox>
+        <>
+            <Checkbox name={"a"} onChange={handleToggle} checked={!v}>I want something something</Checkbox>
+            <hr />
+            <Checkbox name={"a"} onChange={handleChangeNoop} checked={true} disabled={true}>
+                Something else - disabled
+            </Checkbox>
+            <Checkbox name={"a"} onChange={handleChangeNoop} checked={false} disabled={true}>
+                Something else - disabled
+            </Checkbox>
+            <hr />
+            <Checkbox name={"a"} onChange={handleChangeNoop} checked={true} readOnly={true}>
+                Last option - readonly
+            </Checkbox>
+            <Checkbox name={"a"} onChange={handleChangeNoop} checked={false} readOnly={true}>
+                Last option - readonly
+            </Checkbox>
+        </>
     );
 };
 

package/src/demo/components/form/Choice.tsx

@@ -0,0 +1,19 @@
+import React, { useState } from "react";
+import { Choice } from "../../../components/form/choice/Choice";
+import { Section } from "../../../components/layout/section/Section";
+
+interface Props {}
+
+const values = ["Single", "Multiple"];
+
+const ChoiceDemo: React.FC<Props> = () => {
+    const [current, handleCurrent] = useState(values[0]);
+
+    return (
+        <Section variant={["vertical", "horizontal"]}>
+            <Choice values={values} value={current} name={"rnd"} onChange={handleCurrent} />
+        </Section>
+    );
+};
+
+export { ChoiceDemo };

package/src/demo/components/form/Input.tsx

@@ -6,6 +6,10 @@ const InputDemo: React.FC = () => {
     return (
         <>
             <Input placeholder={"Capacity"} prefix={<Icon name={ICON.battery} />} suffix={"kWh"} />
+            <Input value={"William J. Welter"} />
+            <Input prefix={"Text prefix"} value={"Polly W. Wilson"} />
+            <Input prefix={"Disabled"} value={"Clayton J. Foster"} disabled={true} />
+            <Input prefix={"Read only"} value={"Norma J. Gomez"} readOnly={true} />
         </>
     );
 };

package/src/demo/components/ui/tabs/Tabs.tsx

@@ -0,0 +1,15 @@
+import React, { useState } from "react";
+import { Header } from "../../../../components/layout/header/Header";
+import { Selector } from "../../../../components/ui/tabs/Selector";
+
+interface Props {}
+
+const values = ["Recent", "Categories", "Whole Disk"];
+
+const TabsDemo: React.FC<Props> = () => {
+    const [current, handleCurrent] = useState("Recent");
+
+    return <Header><Selector values={values} value={current} onChange={handleCurrent} /></Header>;
+};
+
+export { TabsDemo };

package/src/demo/componentsMap.ts

@@ -38,6 +38,8 @@ import { ToasterDemo } from "./components/ui/toaster/Toaster";
 import { ModalCenteredDemo, ModalDemo, ModalOptionsDemo } from "./components/ui/modal/Modal";
 import { ListInsetDemo } from "./components/layout/list/Inset";
 import { ListSelectionDemo } from "./components/layout/list/Selection";
+import { TabsDemo } from "./components/ui/tabs/Tabs";
+import { ChoiceDemo } from "./components/form/Choice";
 
 interface TheMap {
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -79,6 +81,10 @@ const componentsMap: TheMap = {
                 name: "Toggle",
                 Component: ToggleDemo,
             },
+            Choice: {
+                name: "Choice",
+                Component: ChoiceDemo,
+            },
         },
     },
     Header: {
@@ -153,6 +159,10 @@ const componentsMap: TheMap = {
             },
         },
     },
+    Tabs: {
+        name: "Tabs",
+        Component: TabsDemo,
+    },
     ListItem: {
         name: "List & Item",
         Component: ListItemDemo,

package/src/global.scss

@@ -7,11 +7,12 @@
 
     --background: white;
 
-    --main-color: #008ad2; // used
+    --main-color: #008ad2;
     --main-color-alt: #006AA9;
 
-    --active-bg: #d3d3d3;
-    --inactive-bg: #d3d3d3; // used
+    --active-bg: #e7e7e7;
+    --inactive-bg: #d3d3d3;
+    --inactive-dark-bg: #999;
 
     --toggle-handle-bg: #e0e0e0;
     --toggle-handle-border: #cdcdcd;
@@ -32,6 +33,18 @@
     --modal-button-bg: #f8f8f8;
     --modal-button-border: #c2c2c2;
 
+    --input-disabled-bg: #f3f3f3;
+    --input-disabled-text: #959595;
+
+    --choice-bg: #ffffff;
+    --choice-text: #999999;
+    --choice-active-bg: #f3f3f3;
+    --choice-active-text: #313131;
+    --choice-border: #cfcfcf;
+
+    --selector-text: #606060;
+    --selector-active: var(--main-color);
+
     // Shades: https://maketintsandshades.com/#038bf4,ff7200,7357e8,3ec234,3ec234,ff388f,ea2700
     --blue1: #038bf4;
     --orange1: #ff7200;

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from "./components/form/choice/Choice.js";
 export * from "./components/form/Checkbox.js";
 export * from "./components/form/Input.js";
 export * from "./components/form/Label.js";
@@ -21,4 +22,5 @@ export * from "./components/ui/button/Button.js";
 export * from "./components/ui/directionPad/Pad.js";
 export * from "./components/ui/modal/Modal.js";
 export * from "./components/ui/modal/ModalButtons.js";
+export * from "./components/ui/tabs/Selector.js";
 export * from "./components/ui/toaster/Toaster.js";