@tamagui/checkbox 1.15.19 → 1.15.21

package/dist/jsx/Checkbox.mjs

@@ -144,60 +144,105 @@ const [createCheckboxContext, createCheckboxScope] = createContextScope(CHECKBOX
 const [CheckboxProvider, useCheckboxContext] = createCheckboxContext(CHECKBOX_NAME);
 const Checkbox = withStaticProperties(
   CheckboxFrame.extractable(
-    React.forwardRef(
-      (props, forwardedRef) => {
-        const {
-          __scopeCheckbox,
-          labelledBy: ariaLabelledby,
-          name,
-          checked: checkedProp,
-          defaultChecked,
-          required,
-          scaleIcon = 1,
-          scaleSize = 0.45,
-          sizeAdjust = 0,
-          disabled,
-          value = "on",
-          onCheckedChange,
-          native,
-          ...checkboxProps
-        } = props;
-        const [button, setButton] = React.useState(null);
-        const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node));
-        const hasConsumerStoppedPropagationRef = React.useRef(false);
-        const propsActive = useMediaPropsActive(props);
-        const isFormControl = isWeb ? button ? Boolean(button.closest("form")) : true : false;
-        const [checked = false, setChecked] = useControllableState({
-          prop: checkedProp,
-          defaultProp: defaultChecked,
-          onChange: onCheckedChange
-        });
-        const adjustedSize = getVariableValue(
-          stepTokenUpOrDown("size", propsActive.size, sizeAdjust)
-        );
-        const size = scaleSize ? Math.round(adjustedSize * scaleSize) : adjustedSize;
-        const labelId = useLabelContext(button);
-        const labelledBy = ariaLabelledby || labelId;
-        if (process.env.TAMAGUI_TARGET === "native") {
-          React.useEffect(() => {
-            if (!props.id)
-              return;
-            return registerFocusable(props.id, {
-              focusAndSelect: () => {
-                setChecked((x) => !x);
-              },
-              focus: () => {
-              }
-            });
-          }, [props.id, setChecked]);
-        }
-        return <CheckboxProvider
-          scope={__scopeCheckbox}
-          state={checked}
+    React.forwardRef(function Checkbox2(props, forwardedRef) {
+      const {
+        __scopeCheckbox,
+        labelledBy: ariaLabelledby,
+        name,
+        checked: checkedProp,
+        defaultChecked,
+        required,
+        scaleIcon = 1,
+        scaleSize = 0.45,
+        sizeAdjust = 0,
+        disabled,
+        value = "on",
+        onCheckedChange,
+        native,
+        ...checkboxProps
+      } = props;
+      const [button, setButton] = React.useState(null);
+      const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node));
+      const hasConsumerStoppedPropagationRef = React.useRef(false);
+      const propsActive = useMediaPropsActive(props);
+      const isFormControl = isWeb ? button ? Boolean(button.closest("form")) : true : false;
+      const [checked = false, setChecked] = useControllableState({
+        prop: checkedProp,
+        defaultProp: defaultChecked,
+        onChange: onCheckedChange
+      });
+      const adjustedSize = getVariableValue(
+        stepTokenUpOrDown("size", propsActive.size, sizeAdjust)
+      );
+      const size = scaleSize ? Math.round(adjustedSize * scaleSize) : adjustedSize;
+      const labelId = useLabelContext(button);
+      const labelledBy = ariaLabelledby || labelId;
+      if (process.env.TAMAGUI_TARGET === "native") {
+        React.useEffect(() => {
+          if (!props.id)
+            return;
+          return registerFocusable(props.id, {
+            focusAndSelect: () => {
+              setChecked((x) => !x);
+            },
+            focus: () => {
+            }
+          });
+        }, [props.id, setChecked]);
+      }
+      return <CheckboxProvider
+        scope={__scopeCheckbox}
+        state={checked}
+        disabled={disabled}
+        size={size}
+        scaleIcon={scaleIcon}
+      >{isWeb && native ? <BubbleInput
+        control={button}
+        bubbles={!hasConsumerStoppedPropagationRef.current}
+        name={name}
+        value={value}
+        checked={checked}
+        required={required}
+        disabled={disabled}
+        id={props.id}
+      /> : <>
+        <CheckboxFrame
+          width={size}
+          height={size}
+          tag="button"
+          role="checkbox"
+          aria-labelledby={labelledBy}
+          aria-checked={isIndeterminate(checked) ? "mixed" : checked}
+          aria-required={required}
+          data-state={getState(checked)}
+          data-disabled={disabled ? "" : void 0}
           disabled={disabled}
-          size={size}
-          scaleIcon={scaleIcon}
-        >{isWeb && native ? <BubbleInput
+          {...checkboxProps}
+          ref={composedRefs}
+          {...isWeb && {
+            type: "button",
+            value,
+            onKeyDown: composeEventHandlers(
+              props.onKeyDown,
+              (event) => {
+                if (event.key === "Enter")
+                  event.preventDefault();
+              }
+            )
+          }}
+          onPress={composeEventHandlers(props.onPress, (event) => {
+            setChecked(
+              (prevChecked) => isIndeterminate(prevChecked) ? true : !prevChecked
+            );
+            if (isFormControl) {
+              hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
+              if (!hasConsumerStoppedPropagationRef.current)
+                event.stopPropagation();
+            }
+          })}
+        />
+        {isWeb && isFormControl ? <BubbleInput
+          isHidden
           control={button}
           bubbles={!hasConsumerStoppedPropagationRef.current}
           name={name}
@@ -205,62 +250,14 @@ const Checkbox = withStaticProperties(
           checked={checked}
           required={required}
           disabled={disabled}
-          id={props.id}
-        /> : <>
-          <CheckboxFrame
-            width={size}
-            height={size}
-            tag="button"
-            role="checkbox"
-            aria-labelledby={labelledBy}
-            aria-checked={isIndeterminate(checked) ? "mixed" : checked}
-            aria-required={required}
-            data-state={getState(checked)}
-            data-disabled={disabled ? "" : void 0}
-            disabled={disabled}
-            {...checkboxProps}
-            ref={composedRefs}
-            {...isWeb && {
-              type: "button",
-              value,
-              onKeyDown: composeEventHandlers(
-                props.onKeyDown,
-                (event) => {
-                  if (event.key === "Enter")
-                    event.preventDefault();
-                }
-              )
-            }}
-            onPress={composeEventHandlers(props.onPress, (event) => {
-              setChecked(
-                (prevChecked) => isIndeterminate(prevChecked) ? true : !prevChecked
-              );
-              if (isFormControl) {
-                hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();
-                if (!hasConsumerStoppedPropagationRef.current)
-                  event.stopPropagation();
-              }
-            })}
-          />
-          {isWeb && isFormControl ? <BubbleInput
-            isHidden
-            control={button}
-            bubbles={!hasConsumerStoppedPropagationRef.current}
-            name={name}
-            value={value}
-            checked={checked}
-            required={required}
-            disabled={disabled}
-          /> : null}
-        </>}</CheckboxProvider>;
-      }
-    )
+        /> : null}
+      </>}</CheckboxProvider>;
+    })
   ),
   {
     Indicator: CheckboxIndicator
   }
 );
-Checkbox.displayName = CHECKBOX_NAME;
 export {
   BubbleInput,
   Checkbox,

package/dist/jsx/Checkbox.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Checkbox.tsx"],
-  "mappings": "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",
-  "names": []
+  "mappings": "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",
+  "names": ["Checkbox"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/checkbox",
-  "version": "1.15.19",
+  "version": "1.15.21",
   "sideEffects": [
     "*.css"
   ],
@@ -20,15 +20,15 @@
   },
   "dependencies": {
     "@radix-ui/react-use-previous": "^0.1.1",
-    "@tamagui/core": "1.15.19",
-    "@tamagui/create-context": "1.15.19",
-    "@tamagui/focusable": "1.15.19",
-    "@tamagui/font-size": "1.15.19",
-    "@tamagui/get-size": "1.15.19",
-    "@tamagui/helpers-tamagui": "1.15.19",
-    "@tamagui/label": "1.15.19",
-    "@tamagui/stacks": "1.15.19",
-    "@tamagui/use-controllable-state": "1.15.19"
+    "@tamagui/core": "1.15.21",
+    "@tamagui/create-context": "1.15.21",
+    "@tamagui/focusable": "1.15.21",
+    "@tamagui/font-size": "1.15.21",
+    "@tamagui/get-size": "1.15.21",
+    "@tamagui/helpers-tamagui": "1.15.21",
+    "@tamagui/label": "1.15.21",
+    "@tamagui/stacks": "1.15.21",
+    "@tamagui/use-controllable-state": "1.15.21"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -42,7 +42,7 @@
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.15.19",
+    "@tamagui/build": "1.15.21",
     "react": "^18.2.0"
   },
   "publishConfig": {

package/src/Checkbox.tsx

@@ -246,146 +246,144 @@ export interface CheckboxProps
 
 export const Checkbox = withStaticProperties(
   CheckboxFrame.extractable(
-    React.forwardRef<HTMLButtonElement, CheckboxProps>(
-      (props: ScopedProps<CheckboxProps>, forwardedRef) => {
-        const {
-          __scopeCheckbox,
-          labelledBy: ariaLabelledby,
-          name,
-          checked: checkedProp,
-          defaultChecked,
-          required,
-          scaleIcon = 1,
-          scaleSize = 0.45,
-          sizeAdjust = 0,
-          disabled,
-          value = 'on',
-          onCheckedChange,
-          native,
-          ...checkboxProps
-        } = props
-        const [button, setButton] = React.useState<HTMLButtonElement | null>(null)
-        const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node))
-        const hasConsumerStoppedPropagationRef = React.useRef(false)
-        const propsActive = useMediaPropsActive(props)
-        // We set this to true by default so that events bubble to forms without JS (SSR)
-        const isFormControl = isWeb
-          ? button
-            ? Boolean(button.closest('form'))
-            : true
-          : false
-        const [checked = false, setChecked] = useControllableState({
-          prop: checkedProp,
-          defaultProp: defaultChecked!,
-          onChange: onCheckedChange,
-        })
-
-        const adjustedSize = getVariableValue(
-          stepTokenUpOrDown('size', propsActive.size, sizeAdjust)
-        )
-        const size = scaleSize ? Math.round(adjustedSize * scaleSize) : adjustedSize
-
-        const labelId = useLabelContext(button)
-        const labelledBy = ariaLabelledby || labelId
-
-        if (process.env.TAMAGUI_TARGET === 'native') {
-          // eslint-disable-next-line react-hooks/rules-of-hooks
-          React.useEffect(() => {
-            if (!props.id) return
-            return registerFocusable(props.id, {
-              focusAndSelect: () => {
-                setChecked((x) => !x)
-              },
-              focus: () => {},
-            })
-          }, [props.id, setChecked])
-        }
+    React.forwardRef<HTMLButtonElement, CheckboxProps>(function Checkbox(
+      props: ScopedProps<CheckboxProps>,
+      forwardedRef
+    ) {
+      const {
+        __scopeCheckbox,
+        labelledBy: ariaLabelledby,
+        name,
+        checked: checkedProp,
+        defaultChecked,
+        required,
+        scaleIcon = 1,
+        scaleSize = 0.45,
+        sizeAdjust = 0,
+        disabled,
+        value = 'on',
+        onCheckedChange,
+        native,
+        ...checkboxProps
+      } = props
+      const [button, setButton] = React.useState<HTMLButtonElement | null>(null)
+      const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node))
+      const hasConsumerStoppedPropagationRef = React.useRef(false)
+      const propsActive = useMediaPropsActive(props)
+      // We set this to true by default so that events bubble to forms without JS (SSR)
+      const isFormControl = isWeb
+        ? button
+          ? Boolean(button.closest('form'))
+          : true
+        : false
+      const [checked = false, setChecked] = useControllableState({
+        prop: checkedProp,
+        defaultProp: defaultChecked!,
+        onChange: onCheckedChange,
+      })
 
-        return (
-          <CheckboxProvider
-            scope={__scopeCheckbox}
-            state={checked}
-            disabled={disabled}
-            size={size}
-            scaleIcon={scaleIcon}
-          >
-            {isWeb && native ? (
-              <BubbleInput
-                control={button}
-                bubbles={!hasConsumerStoppedPropagationRef.current}
-                name={name}
-                value={value}
-                checked={checked}
-                required={required}
+      const adjustedSize = getVariableValue(
+        stepTokenUpOrDown('size', propsActive.size, sizeAdjust)
+      )
+      const size = scaleSize ? Math.round(adjustedSize * scaleSize) : adjustedSize
+
+      const labelId = useLabelContext(button)
+      const labelledBy = ariaLabelledby || labelId
+
+      if (process.env.TAMAGUI_TARGET === 'native') {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        React.useEffect(() => {
+          if (!props.id) return
+          return registerFocusable(props.id, {
+            focusAndSelect: () => {
+              setChecked((x) => !x)
+            },
+            focus: () => {},
+          })
+        }, [props.id, setChecked])
+      }
+
+      return (
+        <CheckboxProvider
+          scope={__scopeCheckbox}
+          state={checked}
+          disabled={disabled}
+          size={size}
+          scaleIcon={scaleIcon}
+        >
+          {isWeb && native ? (
+            <BubbleInput
+              control={button}
+              bubbles={!hasConsumerStoppedPropagationRef.current}
+              name={name}
+              value={value}
+              checked={checked}
+              required={required}
+              disabled={disabled}
+              id={props.id}
+            />
+          ) : (
+            <>
+              <CheckboxFrame
+                width={size}
+                height={size}
+                tag="button"
+                role="checkbox"
+                aria-labelledby={labelledBy}
+                aria-checked={isIndeterminate(checked) ? 'mixed' : checked}
+                aria-required={required}
+                data-state={getState(checked)}
+                data-disabled={disabled ? '' : undefined}
                 disabled={disabled}
-                id={props.id}
+                {...checkboxProps}
+                ref={composedRefs}
+                {...(isWeb && {
+                  type: 'button',
+                  value,
+                  onKeyDown: composeEventHandlers(
+                    (props as React.HTMLProps<HTMLButtonElement>).onKeyDown,
+                    (event) => {
+                      // According to WAI ARIA, Checkboxes don't activate on enter keypress
+                      if (event.key === 'Enter') event.preventDefault()
+                    }
+                  ),
+                })}
+                onPress={composeEventHandlers(props.onPress as any, (event) => {
+                  setChecked((prevChecked) =>
+                    isIndeterminate(prevChecked) ? true : !prevChecked
+                  )
+                  if (isFormControl) {
+                    hasConsumerStoppedPropagationRef.current =
+                      event.isPropagationStopped()
+                    // if checkbox is in a form, stop propagation from the button so that we only propagate
+                    // one click event (from the input). We propagate changes from an input so that native
+                    // form validation works and form events reflect checkbox updates.
+                    if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation()
+                  }
+                })}
               />
-            ) : (
-              <>
-                <CheckboxFrame
-                  width={size}
-                  height={size}
-                  tag="button"
-                  role="checkbox"
-                  aria-labelledby={labelledBy}
-                  aria-checked={isIndeterminate(checked) ? 'mixed' : checked}
-                  aria-required={required}
-                  data-state={getState(checked)}
-                  data-disabled={disabled ? '' : undefined}
+
+              {isWeb && isFormControl ? (
+                <BubbleInput
+                  isHidden
+                  control={button}
+                  bubbles={!hasConsumerStoppedPropagationRef.current}
+                  name={name}
+                  value={value}
+                  checked={checked}
+                  required={required}
                   disabled={disabled}
-                  {...checkboxProps}
-                  ref={composedRefs}
-                  {...(isWeb && {
-                    type: 'button',
-                    value,
-                    onKeyDown: composeEventHandlers(
-                      (props as React.HTMLProps<HTMLButtonElement>).onKeyDown,
-                      (event) => {
-                        // According to WAI ARIA, Checkboxes don't activate on enter keypress
-                        if (event.key === 'Enter') event.preventDefault()
-                      }
-                    ),
-                  })}
-                  onPress={composeEventHandlers(props.onPress as any, (event) => {
-                    setChecked((prevChecked) =>
-                      isIndeterminate(prevChecked) ? true : !prevChecked
-                    )
-                    if (isFormControl) {
-                      hasConsumerStoppedPropagationRef.current =
-                        event.isPropagationStopped()
-                      // if checkbox is in a form, stop propagation from the button so that we only propagate
-                      // one click event (from the input). We propagate changes from an input so that native
-                      // form validation works and form events reflect checkbox updates.
-                      if (!hasConsumerStoppedPropagationRef.current)
-                        event.stopPropagation()
-                    }
-                  })}
                 />
-
-                {isWeb && isFormControl ? (
-                  <BubbleInput
-                    isHidden
-                    control={button}
-                    bubbles={!hasConsumerStoppedPropagationRef.current}
-                    name={name}
-                    value={value}
-                    checked={checked}
-                    required={required}
-                    disabled={disabled}
-                  />
-                ) : null}
-              </>
-            )}
-          </CheckboxProvider>
-        )
-      }
-    )
+              ) : null}
+            </>
+          )}
+        </CheckboxProvider>
+      )
+    })
   ),
   {
     Indicator: CheckboxIndicator,
   }
 )
 
-Checkbox.displayName = CHECKBOX_NAME
-
 export { createCheckboxScope }