@tamagui/switch 1.82.0 → 1.82.2

package/src/createSwitch.tsx

@@ -123,155 +123,157 @@ export function createSwitch<F extends SwitchComponent, T extends SwitchThumbCom
     )
   })
 
-  const SwitchComponent = Frame.styleable<SwitchExtraProps>(function SwitchFrame(
-    propsIn,
-    forwardedRef
-  ) {
-    const styledContext = React.useContext(SwitchContext)
-    const props = useProps(propsIn, {
-      noNormalize: true,
-      noExpand: true,
-      resolveValues: 'none',
-      forComponent: Frame,
-    })
-    const {
-      labeledBy: ariaLabelledby,
-      name,
-      checked: checkedProp,
-      defaultChecked,
-      required,
-      disabled,
-      value = 'on',
-      onCheckedChange,
-      size = styledContext.size ?? '$true',
-      unstyled = styledContext.unstyled ?? false,
-      native: nativeProp,
-      nativeProps,
-      children,
-      ...switchProps
-    } = props
+  const SwitchComponent = Frame.styleable<SwitchExtraProps>(
+    function SwitchFrame(propsIn, forwardedRef) {
+      const styledContext = React.useContext(SwitchContext)
+      const props = useProps(propsIn, {
+        noNormalize: true,
+        noExpand: true,
+        resolveValues: 'none',
+        forComponent: Frame,
+      })
+      const {
+        labeledBy: ariaLabelledby,
+        name,
+        checked: checkedProp,
+        defaultChecked,
+        required,
+        disabled,
+        value = 'on',
+        onCheckedChange,
+        size = styledContext.size ?? '$true',
+        unstyled = styledContext.unstyled ?? false,
+        native: nativeProp,
+        nativeProps,
+        children,
+        ...switchProps
+      } = props
 
-    const native = Array.isArray(nativeProp) ? nativeProp : [nativeProp]
+      const native = Array.isArray(nativeProp) ? nativeProp : [nativeProp]
 
-    const shouldRenderMobileNative =
-      (!isWeb && nativeProp === true) ||
-      (!isWeb && native.includes('mobile')) ||
-      (native.includes('android') && Platform.OS === 'android') ||
-      (native.includes('ios') && Platform.OS === 'ios')
+      const shouldRenderMobileNative =
+        (!isWeb && nativeProp === true) ||
+        (!isWeb && native.includes('mobile')) ||
+        (native.includes('android') && Platform.OS === 'android') ||
+        (native.includes('ios') && Platform.OS === 'ios')
 
-    const [button, setButton] = React.useState<HTMLButtonElement | null>(null)
-    const composedRefs = useComposedRefs(forwardedRef, setButton)
-    const labelId = useLabelContext(button)
-    const labelledBy = ariaLabelledby || labelId
-    const hasConsumerStoppedPropagationRef = React.useRef(false)
-    // 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 [button, setButton] = React.useState<HTMLButtonElement | null>(null)
+      const composedRefs = useComposedRefs(forwardedRef, setButton)
+      const labelId = useLabelContext(button)
+      const labelledBy = ariaLabelledby || labelId
+      const hasConsumerStoppedPropagationRef = React.useRef(false)
+      // 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 [frameWidth, setFrameWidth] = React.useState(0)
+      const [frameWidth, setFrameWidth] = React.useState(0)
 
-    const [checked = false, setChecked] = useControllableState({
-      prop: checkedProp,
-      defaultProp: defaultChecked || false,
-      onChange: onCheckedChange,
-      transition: true,
-    })
+      const [checked = false, setChecked] = useControllableState({
+        prop: checkedProp,
+        defaultProp: defaultChecked || false,
+        onChange: onCheckedChange,
+        transition: true,
+      })
 
-    if (shouldRenderMobileNative) {
-      return (
-        <NativeSwitch
-          value={checkedProp}
-          onValueChange={onCheckedChange}
-          {...nativeProps}
-        />
-      )
-    }
+      if (shouldRenderMobileNative) {
+        return (
+          <NativeSwitch
+            value={checkedProp}
+            onValueChange={onCheckedChange}
+            {...nativeProps}
+          />
+        )
+      }
 
-    if (!isWeb) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      React.useEffect(() => {
-        if (!props.id) return
-        return registerFocusable(props.id, {
-          focus: () => {
-            setChecked((x) => !x)
-          },
-        })
-      }, [props.id, setChecked])
-    }
+      if (!isWeb) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        React.useEffect(() => {
+          if (!props.id) return
+          return registerFocusable(props.id, {
+            focus: () => {
+              setChecked((x) => !x)
+            },
+          })
+        }, [props.id, setChecked])
+      }
 
-    const isInsideButton = React.useContext(ButtonNestingContext)
+      const isInsideButton = React.useContext(ButtonNestingContext)
 
-    return (
-      <>
-        <ButtonNestingContext.Provider value={true}>
-          {/* @ts-expect-error todo */}
-          <Frame
-            tag={isInsideButton ? 'span' : 'button'}
-            unstyled={unstyled}
-            size={size}
-            checked={checked}
-            disabled={disabled}
-            frameWidth={frameWidth}
-            themeShallow
-            {...(!disableActiveTheme && {
-              theme: checked ? 'active' : null,
-              themeShallow: true,
-            })}
-            role="switch"
-            aria-checked={checked}
-            aria-labelledby={labelledBy}
-            aria-required={required}
-            data-state={getState(checked)}
-            data-disabled={disabled ? '' : undefined}
-            // @ts-ignore
-            tabIndex={disabled ? undefined : 0}
-            // @ts-ignore
-            value={value}
-            {...switchProps}
-            ref={composedRefs}
-            onPress={composeEventHandlers(props.onPress, (event) => {
-              setChecked((prevChecked) => !prevChecked)
-              if (isWeb && isFormControl) {
-                hasConsumerStoppedPropagationRef.current = event.isPropagationStopped()
-                // if switch 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 switch updates.
-                if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation()
-              }
-            })}
-          >
-            <YStack
-              alignSelf="stretch"
-              flex={1}
-              onLayout={(e) => {
-                setFrameWidth(e.nativeEvent.layout.width)
-              }}
+      return (
+        <>
+          <ButtonNestingContext.Provider value={true}>
+            {/* @ts-expect-error todo */}
+            <Frame
+              tag={isInsideButton ? 'span' : 'button'}
+              unstyled={unstyled}
+              size={size}
+              checked={checked}
+              disabled={disabled}
+              frameWidth={frameWidth}
+              themeShallow
+              {...(!disableActiveTheme && {
+                theme: checked ? 'active' : null,
+                themeShallow: true,
+              })}
+              role="switch"
+              aria-checked={checked}
+              aria-labelledby={labelledBy}
+              aria-required={required}
+              data-state={getState(checked)}
+              data-disabled={disabled ? '' : undefined}
+              // @ts-ignore
+              tabIndex={disabled ? undefined : 0}
+              // @ts-ignore
+              value={value}
+              {...switchProps}
+              ref={composedRefs}
+              onPress={composeEventHandlers(props.onPress, (event) => {
+                setChecked((prevChecked) => !prevChecked)
+                if (isWeb && isFormControl) {
+                  hasConsumerStoppedPropagationRef.current = event.isPropagationStopped()
+                  // if switch 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 switch updates.
+                  if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation()
+                }
+              })}
             >
-              {typeof children === 'function' ? children(checked) : children}
-            </YStack>
-          </Frame>
-        </ButtonNestingContext.Provider>
-        {isWeb && isFormControl && (
-          <BubbleInput
-            control={button}
-            bubbles={!hasConsumerStoppedPropagationRef.current}
-            name={name}
-            value={value}
-            checked={checked}
-            required={required}
-            disabled={disabled}
-            // We transform because the input is absolutely positioned but we have
-            // rendered it **after** the button. This pulls it back to sit on top
-            // of the button.
-            style={{ transform: 'translateX(-100%)' }}
-          />
-        )}
-      </>
-    )
-  })
+              <YStack
+                alignSelf="stretch"
+                flex={1}
+                onLayout={(e) => {
+                  setFrameWidth(e.nativeEvent.layout.width)
+                }}
+              >
+                {typeof children === 'function' ? children(checked) : children}
+              </YStack>
+            </Frame>
+          </ButtonNestingContext.Provider>
+          {isWeb && isFormControl && (
+            <BubbleInput
+              control={button}
+              bubbles={!hasConsumerStoppedPropagationRef.current}
+              name={name}
+              value={value}
+              checked={checked}
+              required={required}
+              disabled={disabled}
+              // We transform because the input is absolutely positioned but we have
+              // rendered it **after** the button. This pulls it back to sit on top
+              // of the button.
+              style={{ transform: 'translateX(-100%)' }}
+            />
+          )}
+        </>
+      )
+    },
+    {
+      disableTheme: true,
+    }
+  )
 
   /* ---------------------------------------------------------------------------------------------- */
 

package/types/createSwitch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSwitch.d.ts","sourceRoot":"","sources":["../src/createSwitch.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,iCAAiC,EAElC,MAAM,eAAe,CAAA;AAOtB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAEL,WAAW,IAAI,iBAAiB,EAEjC,MAAM,cAAc,CAAA;AAKrB,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,eAAe,GAAG,UAAU,GAAG,iBAAiB,CAAA;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,GAAG,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAC/E,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CACrE,CAAA;AAED,KAAK,eAAe,GAAG,iCAAiC,CACtD,WAAW,EACX,iBAAiB,GAAG,gBAAgB,CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG,iCAAiC,CAC3D,eAAe,EACf,iBAAiB,CAClB,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,oBAAoB,EAAE,EACtF,kBAAkB,EAClB,KAAiC,EACjC,KAA0B,GAC3B,EAAE;IACD,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,CAAC,CAAA;CACV;;;;;;;;;EAgRA"}
+{"version":3,"file":"createSwitch.d.ts","sourceRoot":"","sources":["../src/createSwitch.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,iCAAiC,EAElC,MAAM,eAAe,CAAA;AAOtB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAEL,WAAW,IAAI,iBAAiB,EAEjC,MAAM,cAAc,CAAA;AAKrB,KAAK,iBAAiB,GAAG;IACvB,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;IAC1B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,eAAe,GAAG,UAAU,GAAG,iBAAiB,CAAA;AAErD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,GAAG,KAAK,GAAG,SAAS,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,iBAAiB,CAAA;IAC/B,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CACzC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,GAAG,gBAAgB,EAAE,UAAU,CAAC,GAAG;IAC/E,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,KAAK,CAAC,SAAS,CAAC,CAAA;CACrE,CAAA;AAED,KAAK,eAAe,GAAG,iCAAiC,CACtD,WAAW,EACX,iBAAiB,GAAG,gBAAgB,CACrC,CAAA;AAED,KAAK,oBAAoB,GAAG,iCAAiC,CAC3D,eAAe,EACf,iBAAiB,CAClB,CAAA;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,eAAe,EAAE,CAAC,SAAS,oBAAoB,EAAE,EACtF,kBAAkB,EAClB,KAAiC,EACjC,KAA0B,GAC3B,EAAE;IACD,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,KAAK,CAAC,EAAE,CAAC,CAAA;IACT,KAAK,CAAC,EAAE,CAAC,CAAA;CACV;;;;;;;;;EAkRA"}