@vygruppen/spor-react 13.0.2 → 13.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vygruppen/spor-react",
   "type": "module",
-  "version": "13.0.2",
+  "version": "13.0.3",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -47,8 +47,8 @@
     "react-swipeable": "^7.0.1",
     "usehooks-ts": "^3.1.0",
     "@vygruppen/spor-design-tokens": "4.3.3",
-    "@vygruppen/spor-icon-react": "5.0.0",
-    "@vygruppen/spor-loader": "0.7.0"
+    "@vygruppen/spor-loader": "0.7.0",
+    "@vygruppen/spor-icon-react": "5.0.0"
   },
   "devDependencies": {
     "@react-types/datepicker": "^3.10.0",

package/src/input/InputChip.tsx

@@ -0,0 +1,33 @@
+import { Box, Tag as ChakraTag, TagRootProps } from "@chakra-ui/react";
+import { IconComponent } from "@vygruppen/spor-icon-react";
+import React from "react";
+
+export type InputChipProps = TagRootProps & {
+  startIcon?: IconComponent;
+  endIcon?: IconComponent;
+  onClick?: VoidFunction;
+};
+
+export const InputChip = ({
+  startIcon,
+  endIcon,
+  children,
+  ref,
+  ...rest
+}: InputChipProps & { ref?: React.Ref<HTMLDivElement> }) => {
+  return (
+    <ChakraTag.Root ref={ref} {...rest} as="button">
+      {startIcon && (
+        <ChakraTag.StartElement>
+          <Box as={startIcon} />
+        </ChakraTag.StartElement>
+      )}
+      <ChakraTag.Label>{children}</ChakraTag.Label>
+      {endIcon && (
+        <ChakraTag.EndElement>
+          <Box as={endIcon} />
+        </ChakraTag.EndElement>
+      )}
+    </ChakraTag.Root>
+  );
+};

package/src/input/PasswordInput.tsx

@@ -16,7 +16,8 @@ export interface PasswordVisibilityProps {
 }
 
 export interface PasswordInputProps
-  extends InputProps, PasswordVisibilityProps {
+  extends InputProps,
+    PasswordVisibilityProps {
   rootProps?: InputProps;
 }
 

package/src/input/Select.tsx

@@ -8,6 +8,8 @@ import type {
 } from "@chakra-ui/react";
 import {
   Box,
+  Checkbox as ChakraCheckbox,
+  Flex,
   Portal,
   Select as ChakraSelect,
   useSelectContext,
@@ -21,6 +23,7 @@ import * as React from "react";
 
 import { CloseButton } from "@/button";
 
+import { Badge } from "..";
 import { Field, FieldProps } from "./Field";
 
 export type SelectProps = ChakraSelectRootProps &
@@ -95,7 +98,7 @@ export const Select = ({
         position="relative"
       >
         <SelectTrigger data-attachable>
-          <SelectValueText withPlaceholder={label ? true : false} />
+          <SelectValueText withPlaceholder={!!label} />
         </SelectTrigger>
         {label && <SelectLabel css={styles.label}>{label}</SelectLabel>}
         <SelectContent css={styles.selectContent} baseStyle={css}>
@@ -112,7 +115,7 @@ export const SelectLabel = (props: SelectLabelProps) => {
   return (
     <ChakraSelect.Label
       {...props}
-      data-selected={value.length > 0 ? true : undefined}
+      data-selected={value.length > 0 || undefined}
     />
   );
 };
@@ -131,8 +134,19 @@ export const SelectItem = ({
   const { item, children, description, ...rest } = props;
   const recipe = useSlotRecipe({ key: "select" });
   const styles = recipe();
+  const selectContext = useSelectContext();
+  const multiple = selectContext.multiple;
+  const isSelected = selectContext.value.includes(item.value);
+
   return (
     <ChakraSelect.Item item={item} {...rest} ref={ref} css={styles.item}>
+      {multiple && (
+        <ChakraCheckbox.Root checked={isSelected} pointerEvents="none">
+          <ChakraCheckbox.Control>
+            <ChakraCheckbox.Indicator />
+          </ChakraCheckbox.Control>
+        </ChakraCheckbox.Root>
+      )}
       <Box width="100%">
         <ChakraSelect.ItemText display="flex">{children}</ChakraSelect.ItemText>
         {description && (
@@ -142,12 +156,15 @@ export const SelectItem = ({
         )}
       </Box>
 
-      <ChakraSelect.ItemIndicator>
-        <CheckmarkFill18Icon />
-      </ChakraSelect.ItemIndicator>
+      {!multiple && (
+        <ChakraSelect.ItemIndicator>
+          <CheckmarkFill18Icon />
+        </ChakraSelect.ItemIndicator>
+      )}
     </ChakraSelect.Item>
   );
 };
+SelectItem.displayName = "SelectItem";
 
 type SelectItemGroupProps = ChakraSelect.ItemGroupProps & {
   label: React.ReactNode;
@@ -249,6 +266,7 @@ type SelectValueTextProps = Omit<ChakraSelect.ValueTextProps, "children"> & {
   children?(items: CollectionItem[]): React.ReactNode;
   placeholder?: string;
   withPlaceholder?: boolean;
+  multiple?: boolean;
 };
 
 export const SelectValueText = function SelectValueText({
@@ -258,6 +276,10 @@ export const SelectValueText = function SelectValueText({
   ref?: React.Ref<HTMLSpanElement>;
 }) {
   const { children, withPlaceholder, placeholder, ...rest } = props;
+
+  const selectContext = useSelectContext();
+  const multiple = selectContext.multiple;
+
   return (
     <ChakraSelect.ValueText
       {...rest}
@@ -277,9 +299,24 @@ export const SelectValueText = function SelectValueText({
           const items = select.selectedItems;
           if (items.length === 0) return placeholder;
           if (children) return children(items);
-          if (items.length === 1)
+          if (multiple) {
+            return (
+              <Flex gap={0.5} marginBottom={1}>
+                {items.map((item) => (
+                  <Badge
+                    key={select.collection.stringifyItem(item)}
+                    size="sm"
+                    colorPalette="green"
+                  >
+                    {select.collection.stringifyItem(item)}
+                  </Badge>
+                ))}
+              </Flex>
+            );
+          }
+          if (items.length === 1) {
             return select.collection.stringifyItem(items[0]);
-          return `${items.length} selected`;
+          }
         }}
       </ChakraSelect.Context>
     </ChakraSelect.ValueText>

package/src/input/index.ts

@@ -8,6 +8,7 @@ export * from "./Combobox";
 export * from "./Field";
 export * from "./Fieldset";
 export * from "./Input";
+export * from "./InputChip";
 export * from "./ListBox";
 export * from "./Menu";
 export * from "./NativeSelect";

package/src/theme/slot-recipes/anatomy.ts

@@ -286,6 +286,8 @@ export const comboboxAnatomy = arkComboboxAnatomy.extendWith(
   "empty",
 );
 
+export const tagAnatomy = createAnatomy("tag").parts("root");
+
 export const menuAnatomy = createAnatomy("menu").parts(
   "trigger",
   "content",

package/src/theme/slot-recipes/index.ts

@@ -13,6 +13,7 @@ import { drawerSlotRecipe } from "./drawer";
 import { fieldSlotRecipe } from "./field";
 import { floatingActionButtonSlotRecipe } from "./floating-action-button";
 import { infoTagSlotRecipe } from "./info-tag";
+import { inputChipSlotRecipe } from "./input-chip";
 import { lineIconSlotRecipe } from "./line-icon";
 import { listSlotRecipe } from "./list";
 import { listBoxSlotRecipe } from "./listbox";
@@ -70,5 +71,6 @@ export const slotRecipes = {
   checkboxCard: choiceChipSlotRecipe,
   collapsible: collapsibleSlotRecipe,
   tooltip: popoverSlotRecipe,
+  tag: inputChipSlotRecipe,
   menu: menuSlotRecipe,
 };

package/src/theme/slot-recipes/input-chip.ts

@@ -0,0 +1,118 @@
+import { defineSlotRecipe } from "@chakra-ui/react";
+
+import { tagAnatomy } from "./anatomy";
+
+export const inputChipSlotRecipe = defineSlotRecipe({
+  slots: tagAnatomy.keys(),
+  className: "chakra-tag",
+  base: {
+    root: {
+      display: "flex",
+      direction: "row",
+      width: "fit-content",
+      height: "fit-content",
+      alignItems: "center",
+      justifyContent: "center",
+      gap: "1",
+      outline: "none",
+      "&:focus": {
+        outline: "2px solid",
+        outlineColor: "outline.focus",
+      },
+    },
+  },
+  variants: {
+    variant: {
+      core: {
+        root: {
+          backgroundColor: "surface",
+          border: "1px solid",
+          borderColor: "outline",
+          "&:hover": {
+            outline: "2px solid",
+            outlineColor: "core.outline.hover",
+          },
+          "&:active": {
+            outline: "none",
+            backgroundColor: "core.surface.active",
+          },
+        },
+      },
+      accent: {
+        root: {
+          backgroundColor: "accent.surface",
+          color: "text.highlight",
+          "& svg": {
+            color: "icon.highlight",
+          },
+          "&:hover": {
+            backgroundColor: "accent.surface.hover",
+          },
+          "&:active": {
+            backgroundColor: "accent.surface.active",
+            outline: "none",
+          },
+        },
+      },
+      brand: {
+        root: {
+          backgroundColor: "brand.surface",
+          color: "text.inverted",
+          "& svg": {
+            color: "icon.inverted",
+          },
+          "&:hover": {
+            backgroundColor: "brand.surface.hover",
+          },
+          "&:active": {
+            backgroundColor: "brand.surface.active",
+            outline: "none",
+          },
+        },
+      },
+    },
+    size: {
+      xs: {
+        root: {
+          fontSize: "desktop.xs",
+          paddingX: "1.5",
+          paddingY: "0",
+          fontWeight: "normal",
+          borderRadius: "xs",
+        },
+      },
+      sm: {
+        root: {
+          fontSize: "desktop.sm",
+          paddingX: "2",
+          paddingY: "0.5",
+          fontWeight: "bold",
+          borderRadius: "9px",
+        },
+      },
+      md: {
+        root: {
+          padding: 5,
+          fontSize: "desktop.md",
+          paddingX: "2",
+          paddingY: "1",
+          fontWeight: "bold",
+          borderRadius: "sm",
+        },
+      },
+      lg: {
+        root: {
+          fontSize: "desktop.md",
+          paddingX: "2",
+          paddingY: "3",
+          fontWeight: "bold",
+          borderRadius: "md",
+        },
+      },
+    },
+  },
+  defaultVariants: {
+    variant: "core",
+    size: "sm",
+  },
+});

package/src/theme/slot-recipes/select.ts

@@ -117,7 +117,7 @@ export const selectSlotRecipe = defineSlotRecipe({
         outlineOffset: "2px",
         outline: "2px solid",
         outlineColor: "outline.focus",
-        backgroundColor: "ghost.surface.hover",
+        backgroundColor: "accent.surface.hover",
       },
       "&[data-highlighted]": {
         outlineOffset: "2px",
@@ -125,7 +125,7 @@ export const selectSlotRecipe = defineSlotRecipe({
         outlineColor: "outline.focus",
       },
       _active: {
-        backgroundColor: "ghost.surface.active",
+        backgroundColor: "accent.surface.active",
       },
       _highlighted: {
         _active: {
@@ -133,12 +133,12 @@ export const selectSlotRecipe = defineSlotRecipe({
         },
       },
       _hover: {
-        backgroundColor: "ghost.surface.hover",
+        backgroundColor: "accent.surface.hover",
         outline: "2px solid core.outline",
         outlineOffset: "2px",
       },
       _selected: {
-        backgroundColor: "ghost.surface.active",
+        backgroundColor: "accent.surface",
       },
       _icon: {
         width: 3,