@firecms/ui 3.0.0-canary.120 → 3.0.0-canary.122

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/ui",
   "type": "module",
-  "version": "3.0.0-canary.120",
+  "version": "3.0.0-canary.122",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -105,7 +105,7 @@
     "src",
     "tailwind.config.js"
   ],
-  "gitHead": "aa817730cb582b5724774a50ac8a512bf0643ef3",
+  "gitHead": "34cb0d35ba1246cad86def496affcb87fb9a91cf",
   "publishConfig": {
     "access": "public"
   }

package/src/components/MultiSelect.tsx

@@ -1,190 +1,332 @@
+import * as PopoverPrimitive from "@radix-ui/react-popover";
 import * as React from "react";
-import { useEffect } from "react";
-import * as Dialog from "@radix-ui/react-dialog";
-
+import { ChangeEvent, Children, useEffect } from "react";
 import { Command as CommandPrimitive } from "cmdk";
-
-import { ExpandMoreIcon } from "../icons";
-import { fieldBackgroundDisabledMixin, fieldBackgroundHoverMixin, fieldBackgroundMixin, focusedDisabled } from "../styles";
 import { cls } from "../util";
+import { CloseIcon, ExpandMoreIcon, Icon } from "../icons";
+import { Separator } from "./Separator";
+import { Chip } from "./Chip";
 import { SelectInputLabel } from "./common/SelectInputLabel";
-import { useOutsideAlerter } from "../hooks";
+import {
+    defaultBorderMixin,
+    fieldBackgroundDisabledMixin,
+    fieldBackgroundHoverMixin,
+    fieldBackgroundInvisibleMixin,
+    fieldBackgroundMixin,
+    focusedDisabled
+} from "../styles";
+import { useInjectStyles } from "../hooks";
+
+interface MultiSelectContextProps {
+    fieldValue?: string[];
+    onItemClick: (v: string) => void;
+}
+
+export const MultiSelectContext = React.createContext<MultiSelectContextProps>({} as any);
+
+/**
+ * Props for MultiSelect component
+ */
+interface MultiSelectProps {
+
+    /**
+     * The modality of the popover. When set to true, interaction with outside elements
+     * will be disabled and only popover content will be visible to screen readers.
+     * Optional, defaults to false.
+     */
+    modalPopover?: boolean;
+
+    /**
+     * Additional class names to apply custom styles to the multi-select component.
+     * Optional, can be used to add custom styles.
+     */
+    className?: string;
 
-export type MultiSelectProps = {
     open?: boolean,
     name?: string,
     id?: string,
     onOpenChange?: (open: boolean) => void,
     value?: string[],
-    containerClassName?: string,
-    className?: string,
     inputClassName?: string,
-    onMultiValueChange?: (updatedValue: string[]) => void,
+    onChange?: React.EventHandler<ChangeEvent<HTMLSelectElement>>,
+    onValueChange?: (updatedValue: string[]) => void,
     placeholder?: React.ReactNode,
-    renderValue?: (values: string, index:number) => React.ReactNode,
-    renderValues?: (values: string[]) => React.ReactNode,
     size?: "small" | "medium",
-    label?: React.ReactNode,
+    useChips?: boolean,
+    label?: React.ReactNode | string,
     disabled?: boolean,
     error?: boolean,
     position?: "item-aligned" | "popper",
+    endAdornment?: React.ReactNode,
+    multiple?: boolean,
+    includeClear?: boolean,
     inputRef?: React.RefObject<HTMLButtonElement>,
-    children?: React.ReactNode,
-};
-
-interface MultiSelectContextProps {
-    fieldValue?: string[];
-    setInputValue: (v: string) => void;
-    onValueChangeInternal: (v: string) => void;
+    padding?: boolean,
+    invisible?: boolean,
+    children: React.ReactNode;
+    renderValues?: (values: string[]) => React.ReactNode;
 }
 
-export const MultiSelectContext = React.createContext<MultiSelectContextProps>({} as any);
+export const MultiSelect = React.forwardRef<
+    HTMLButtonElement,
+    MultiSelectProps
+>(
+    (
+        {
+            value,
+            size,
+            label,
+            error,
+            onValueChange,
+            invisible,
+            disabled,
+            placeholder,
+            modalPopover = false,
+            includeClear = true,
+            useChips = true,
+            className,
+            children,
+            renderValues,
+            open,
+            onOpenChange,
+        },
+        ref
+    ) => {
+        const [isPopoverOpen, setIsPopoverOpen] = React.useState(open ?? false);
+        const [selectedValues, setSelectedValues] = React.useState<string[]>(value ?? []);
+        console.log("selectedValues", selectedValues);
 
-export function MultiSelect({
-                                value,
-                                open,
-                                onMultiValueChange,
-                                size = "medium",
-                                label,
-                                disabled,
-                                renderValue,
-                                renderValues,
-                                containerClassName,
-                                className,
-                                children,
-                                error
-                            }: MultiSelectProps) {
-
-    const containerRef = React.useRef<HTMLInputElement>(null);
-    const inputRef = React.useRef<HTMLInputElement>(null);
-    const listRef = React.useRef<HTMLDivElement>(null);
-    useOutsideAlerter(listRef, () => setOpenInternal(false));
-
-    const [openInternal, setOpenInternal] = React.useState(false);
-    useEffect(() => {
-        setOpenInternal(open ?? false);
-    }, [open]);
-
-    const onValueChangeInternal = React.useCallback((newValue: string) => {
-        if (Array.isArray(value) && value.includes(newValue)) {
-            onMultiValueChange?.(value.filter(v => v !== newValue));
-        } else {
-            onMultiValueChange?.([...(value ?? []), newValue]);
+        const onPopoverOpenChange = (open: boolean) => {
+            setIsPopoverOpen(open);
+            onOpenChange?.(open);
         }
-    }, [value, onMultiValueChange]);
-
-    const [inputValue, setInputValue] = React.useState("");
-    const [boundingRect, setBoundingRect] = React.useState<DOMRect | null>(null);
-
-    const handleKeyDown = React.useCallback((e: React.KeyboardEvent<HTMLDivElement>) => {
-        const input = inputRef.current
-        if (input) {
-            if (e.key === "Delete" || e.key === "Backspace") {
-                if (input.value === "") {
-                    const newSelected = [...(value ?? [])];
-                    newSelected.pop();
-                    onMultiValueChange?.(newSelected);
+
+        useEffect(() => {
+            setIsPopoverOpen(open ?? false);
+        }, [open]);
+
+        const allValues = children
+            ?
+            // @ts-ignore
+            Children.map(children, (child) => {
+                if (React.isValidElement(child)) {
+                    return child.props.value;
                 }
+                return null;
+            }).filter(Boolean) as string[]
+            : [];
+
+        React.useEffect(() => {
+            setSelectedValues(value ?? []);
+        }, [value]);
+
+        function onItemClick(newValue: string) {
+            let newSelectedValues: string[];
+            if (selectedValues.includes(newValue)) {
+                newSelectedValues = selectedValues.filter((v) => v !== newValue);
+            } else {
+                newSelectedValues = [...selectedValues, newValue];
             }
-            // This is not a default behaviour of the <input /> field
-            if (e.key === "Escape") {
-                input.blur();
-                setOpenInternal(false);
-                e.stopPropagation();
-            }
+            updateValues(newSelectedValues);
         }
-    }, [onMultiValueChange, value]);
-
-    const openDialog = React.useCallback(() => {
-        setBoundingRect(containerRef.current?.getBoundingClientRect() ?? null);
-        setOpenInternal(true);
-    }, []);
-
-    const usedBoundingRect = boundingRect ?? containerRef.current?.getBoundingClientRect();
-    const maxHeight = window.innerHeight - (usedBoundingRect?.top ?? 0) - (usedBoundingRect?.height ?? 0) - 16;
-
-    return (<>
-
-            {typeof label === "string" ? <SelectInputLabel error={error}>{label}</SelectInputLabel> : label}
-
-            <CommandPrimitive onKeyDown={handleKeyDown}
-                              onClick={() => {
-                                  inputRef.current?.focus();
-                                  openDialog()
-                              }}
-                              className={cls("relative overflow-visible bg-transparent", containerClassName)}>
-                <div
-                    ref={containerRef}
-                    className={cls(
-                        "flex flex-row",
-                        size === "small" ? "min-h-[42px]" : "min-h-[64px]",
-                        "select-none rounded-md text-sm",
-                        fieldBackgroundMixin,
-                        disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin,
-                        "relative flex items-center",
-                        "p-4",
-                        error ? "text-red-500 dark:text-red-600" : "focus:text-text-primary dark:focus:text-text-primary-dark",
-                        error ? "border border-red-500 dark:border-red-600" : "",
-                        className)}
+
+        function updateValues(values: string[]) {
+            setSelectedValues(values);
+            onValueChange?.(values);
+        }
+
+        const handleInputKeyDown = (
+            event: React.KeyboardEvent<HTMLInputElement>
+        ) => {
+            if (event.key === "Enter") {
+                onPopoverOpenChange(true);
+            } else if (event.key === "Backspace" && !event.currentTarget.value) {
+                const newSelectedValues = [...selectedValues];
+                newSelectedValues.pop();
+                updateValues(newSelectedValues);
+            }
+        };
+
+        const toggleOption = (value: string) => {
+            const newSelectedValues = selectedValues.includes(value)
+                ? selectedValues.filter((v) => v !== value)
+                : [...selectedValues, value];
+            updateValues(newSelectedValues);
+        };
+
+        const handleClear = () => {
+            updateValues([]);
+        };
+
+        const handleTogglePopover = () => {
+            onPopoverOpenChange(!isPopoverOpen);
+        };
+
+        const toggleAll = () => {
+            if (selectedValues.length === allValues.length) {
+                handleClear();
+            } else {
+                updateValues(allValues);
+            }
+        };
+
+        useInjectStyles("MultiSelect", `
+[cmdk-group] {
+  max-height: 45vh;
+  overflow-y: auto;
+  // width: 400px;
+} `)
+
+        return (
+            <MultiSelectContext.Provider
+                value={{
+                    fieldValue: selectedValues,
+                    onItemClick
+                }}>
+
+                {typeof label === "string" ? <SelectInputLabel error={error}>{label}</SelectInputLabel> : label}
+
+                <PopoverPrimitive.Root
+                    open={isPopoverOpen}
+                    onOpenChange={onPopoverOpenChange}
+                    modal={modalPopover}
                 >
-                    <div className={cls("flex-grow flex gap-1.5 flex-wrap items-center")}>
-                        {renderValue && (value ?? []).map((v, i) => renderValue(v, i))}
-                        {renderValues && renderValues(value ?? [])}
-                        <CommandPrimitive.Input
-                            ref={inputRef}
-                            value={inputValue}
-                            onValueChange={setInputValue}
-                            // onBlur={() => setOpenInternal(false)}
-                            onFocus={openDialog}
-                            className={cls("ml-2 bg-transparent outline-none flex-1 h-full w-full ", focusedDisabled)}
-                        />
-                    </div>
-                    <div className={"px-2 h-full flex items-center"}>
-                        <ExpandMoreIcon size={"small"}
-                                        className={cls("transition ", openInternal ? "rotate-180" : "")}/>
-                    </div>
-
-                </div>
-
-                <Dialog.Root open={openInternal}
-                             modal={true}
-                             onOpenChange={setOpenInternal}>
-                    <Dialog.Portal>
-                        <MultiSelectContext.Provider
-                            value={{
-                                fieldValue: value,
-                                setInputValue,
-                                onValueChangeInternal
-                            }}>
-                            <div
-                                ref={listRef}
-                                className={"z-50 absolute overflow-auto outline-none"}
-                                style={{
-                                    pointerEvents: openInternal ? "auto" : "none",
-                                    top: (usedBoundingRect?.top ?? 0) + (usedBoundingRect?.height ?? 0),
-                                    left: usedBoundingRect?.left,
-                                    // right: boundingRect?.right,
-                                    width: usedBoundingRect?.width,
-                                    maxHeight: maxHeight,
-
-                                }}>
-
-                                <CommandPrimitive.Group
-                                    className="mt-2 text-slate-900 dark:text-white animate-in z-50 border border-slate-200 dark:border-slate-800 bg-white dark:bg-slate-800 p-2 rounded-lg shadow-lg flex flex-col outline-none w-full"
-                                >
+                    <PopoverPrimitive.Trigger asChild>
+                        <button
+                            ref={ref}
+                            onClick={handleTogglePopover}
+                            className={cls(
+                                size === "small" ? "min-h-[42px]" : "min-h-[64px]",
+                                "py-2",
+                                "px-4",
+                                "select-none rounded-md text-sm",
+                                invisible ? fieldBackgroundInvisibleMixin : fieldBackgroundMixin,
+                                disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin,
+                                "relative flex items-center",
+                                className
+                            )}
+                        >
+                            {selectedValues.length > 0 ? (
+                                <div className="flex justify-between items-center w-full">
+                                    <div className="flex flex-wrap items-center gap-1.5 text-start">
+                                        {renderValues && renderValues(selectedValues)}
+                                        {!renderValues && selectedValues.map((value) => {
+
+                                            // @ts-ignore
+                                            const childrenProps: MultiSelectItemProps[] = Children.map(children, (child) => {
+                                                if (React.isValidElement(child)) {
+                                                    return child.props;
+                                                }
+                                            }).filter(Boolean);
 
+                                            const option = childrenProps.find((o) => o.value === value);
+                                            if (!useChips) {
+                                                return option?.children;
+                                            }
+                                            return (
+                                                <Chip
+                                                    size={"small"}
+                                                    key={value}
+                                                    className={cls("flex flex-row items-center p-1")}
+                                                >
+                                                    {option?.children}
+                                                    <CloseIcon
+                                                        size={"smallest"}
+                                                        onClick={(event) => {
+                                                            event.stopPropagation();
+                                                            toggleOption(value);
+                                                        }}
+                                                    />
+                                                </Chip>
+                                            );
+                                        })}
+                                    </div>
+                                    <div className="flex items-center justify-between">
+                                        {includeClear && <CloseIcon
+                                            className={"ml-4"}
+                                            size={"small"}
+                                            onClick={(event) => {
+                                                event.stopPropagation();
+                                                handleClear();
+                                            }}
+                                        />}
+                                        <div className={cls("px-2 h-full flex items-center")}>
+                                            <ExpandMoreIcon size={"small"}
+                                                            className={cls("transition", isPopoverOpen ? "rotate-180" : "")}/>
+                                        </div>
+                                    </div>
+                                </div>
+                            ) : (
+                                <div className="flex items-center justify-between w-full mx-auto">
+                                    <span className="text-sm">
+                                      {placeholder}
+                                    </span>
+                                    <div className={cls("px-2 h-full flex items-center")}>
+                                        <ExpandMoreIcon size={"small"}
+                                                        className={cls("transition", isPopoverOpen ? "rotate-180" : "")}/>
+                                    </div>
+                                </div>
+                            )}
+                        </button>
+                    </PopoverPrimitive.Trigger>
+                    <PopoverPrimitive.Content
+                        className={cls("z-50 relative overflow-hidden border bg-white dark:bg-gray-900 rounded-lg w-[400px]", defaultBorderMixin)}
+                        align="start"
+                        sideOffset={8}
+                        onEscapeKeyDown={() => onPopoverOpenChange(false)}
+                    >
+                        <CommandPrimitive>
+                            <div className={"flex flex-row items-center"}>
+                                <CommandPrimitive.Input
+                                    className={cls(focusedDisabled, "bg-transparent outline-none flex-1 h-full w-full m-4 flex-grow")}
+                                    placeholder="Search..."
+                                    onKeyDown={handleInputKeyDown}
+                                />
+                                {selectedValues.length > 0 && (
+                                    <div
+                                        onClick={handleClear}
+                                        className="text-sm justify-center cursor-pointer py-3 px-4 text-text-secondary dark:text-text-secondary-dark">
+                                        Clear
+                                    </div>
+                                )}
+                            </div>
+                            <Separator orientation={"horizontal"} className={"my-0"}/>
+                            <CommandPrimitive.List>
+                                <CommandPrimitive.Empty className={"px-4 py-2"}>
+                                    No results found.
+                                </CommandPrimitive.Empty>
+                                <CommandPrimitive.Group>
+                                    <CommandPrimitive.Item
+                                        key="all"
+                                        onSelect={toggleAll}
+                                        className={
+                                            cls(
+                                                "flex flex-row items-center gap-1.5",
+                                                "cursor-pointer",
+                                                "m-1",
+                                                "ring-offset-transparent",
+                                                "p-1 rounded aria-[selected=true]:outline-none aria-[selected=true]:ring-2 aria-[selected=true]:ring-primary aria-[selected=true]:ring-opacity-75 aria-[selected=true]:ring-offset-2",
+                                                "aria-[selected=true]:bg-slate-100 aria-[selected=true]:dark:bg-slate-900",
+                                                "cursor-pointer p-2 rounded aria-[selected=true]:bg-slate-100 aria-[selected=true]:dark:bg-slate-900"
+                                            )
+                                        }
+                                    >
+                                        <InnerCheckBox checked={selectedValues.length === allValues.length}/>
+                                        <span className={"text-sm text-text-secondary dark:text-text-secondary-dark"}>(Select All)</span>
+                                    </CommandPrimitive.Item>
                                     {children}
                                 </CommandPrimitive.Group>
 
-                            </div>
-                        </MultiSelectContext.Provider>
-                    </Dialog.Portal>
-                </Dialog.Root>
-            </CommandPrimitive>
+                            </CommandPrimitive.List>
+                        </CommandPrimitive>
+                    </PopoverPrimitive.Content>
+                </PopoverPrimitive.Root>
+            </MultiSelectContext.Provider>
+        );
+    }
+);
 
-        </>
-    )
-}
+MultiSelect.displayName = "MultiSelect";
 
 export interface MultiSelectItemProps {
     value: string;
@@ -192,32 +334,63 @@ export interface MultiSelectItemProps {
     className?: string;
 }
 
-export function MultiSelectItem({ children, value, className }: MultiSelectItemProps) {
+export function MultiSelectItem({
+                                    children,
+                                    value,
+                                    className
+                                }: MultiSelectItemProps) {
 
     const context = React.useContext(MultiSelectContext);
     if (!context) throw new Error("MultiSelectItem must be used inside a MultiSelect");
-    const { fieldValue, setInputValue, onValueChangeInternal } = context;
+    const {
+        fieldValue,
+        onItemClick
+    } = context;
 
+    const isSelected = (fieldValue ?? []).includes(value);
     return <CommandPrimitive.Item
+        // value={value}
         onMouseDown={(e) => {
             e.preventDefault();
             e.stopPropagation();
         }}
         onSelect={(_) => {
-            setInputValue("");
-            onValueChangeInternal(value);
+            onItemClick(value);
         }}
         className={cls(
-            (fieldValue ?? []).includes(value) ? "bg-slate-200 dark:bg-slate-950" : "",
+            "flex flex-row items-center gap-1.5",
+            isSelected ? "bg-slate-200 dark:bg-slate-950" : "",
             "cursor-pointer",
             "m-1",
             "ring-offset-transparent",
-            "p-2 rounded aria-[selected=true]:outline-none aria-[selected=true]:ring-2 aria-[selected=true]:ring-primary aria-[selected=true]:ring-opacity-75 aria-[selected=true]:ring-offset-2",
+            "p-1 rounded aria-[selected=true]:outline-none aria-[selected=true]:ring-2 aria-[selected=true]:ring-primary aria-[selected=true]:ring-opacity-75 aria-[selected=true]:ring-offset-2",
             "aria-[selected=true]:bg-slate-100 aria-[selected=true]:dark:bg-slate-900",
             "cursor-pointer p-2 rounded aria-[selected=true]:bg-slate-100 aria-[selected=true]:dark:bg-slate-900",
             className
         )}
     >
+        <InnerCheckBox checked={isSelected}/>
         {children}
     </CommandPrimitive.Item>;
+
 }
+
+function InnerCheckBox({ checked }: { checked: boolean }) {
+    return <div className={cls(
+        "p-2",
+        "w-8 h-8",
+        "inline-flex items-center justify-center text-sm font-medium focus:outline-none transition-colors ease-in-out duration-150",
+    )}>
+        <div
+            className={cls(
+                "border-2 relative transition-colors ease-in-out duration-150",
+                "w-4 h-4 rounded flex items-center justify-center",
+                (checked ? "bg-primary" : "bg-white dark:bg-slate-900"),
+                (checked) ? "text-slate-100 dark:text-slate-900" : "",
+                (checked ? "border-transparent" : "border-slate-800 dark:border-slate-200")
+            )}>
+            {checked && <Icon iconKey={"check"} size={16} className={"absolute"}/>}
+        </div>
+    </div>
+}
+

package/src/components/Popover.tsx

@@ -60,7 +60,7 @@ export function Popover({
         <PopoverPrimitive.Portal container={portalContainer}>
             <PopoverPrimitive.Content
                 className={cls(paperMixin,
-                    "PopoverContent shadow z-40", className)}
+                    "PopoverContent z-40", className)}
                 side={side}
                 sideOffset={sideOffset}
                 align={align}