@tamagui/switch 1.0.1-beta.138 → 1.0.1-beta.141

package/dist/jsx/Switch.js

@@ -109,8 +109,7 @@ const Switch = withStaticProperties(SwitchFrame.extractable(React.forwardRef((pr
   }
   return <SwitchProvider scope={__scopeSwitch} checked={checked} disabled={disabled} size={size}>
     <SwitchFrame size={size} role="switch" aria-checked={checked} aria-labelledby={labelledBy} aria-required={required} data-state={getState(checked)} data-disabled={disabled ? "" : void 0} disabled={disabled} theme={checked ? "active" : null} themeShallow tabIndex={disabled ? void 0 : 0} value={value} {...switchProps} ref={composedRefs} onPress={(event) => {
-      var _a;
-      (_a = props.onPress) == null ? void 0 : _a.call(props, event);
+      props.onPress?.(event);
       setChecked((prevChecked) => !prevChecked);
       if (isWeb && isFormControl) {
         hasConsumerStoppedPropagationRef.current = event.isPropagationStopped();

package/dist/jsx/Switch.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/Switch.tsx"],
   "sourcesContent": ["// via radix\n// https://github.com/radix-ui/primitives/blob/main/packages/react/switch/src/Switch.tsx\n\nimport { usePrevious } from '@radix-ui/react-use-previous'\nimport { useComposedRefs } from '@tamagui/compose-refs'\nimport {\n  GetProps,\n  SizeTokens,\n  calc,\n  getSize,\n  getVariableValue,\n  isWeb,\n  styled,\n  withStaticProperties,\n} from '@tamagui/core'\nimport { ScopedProps, createContextScope } from '@tamagui/create-context'\nimport { registerFocusable } from '@tamagui/focusable'\nimport { useLabelContext } from '@tamagui/label'\nimport { ThemeableStack, XStack } from '@tamagui/stacks'\nimport { useControllableState } from '@tamagui/use-controllable-state'\nimport * as React from 'react'\nimport { View } from 'react-native'\n\nconst SWITCH_NAME = 'Switch'\n\n// TODO make customizable\nconst getSwitchHeight = (val: SizeTokens) => Math.round(getVariableValue(getSize(val)) * 0.65)\nconst getSwitchWidth = (val: SizeTokens) => getSwitchHeight(val) * 2\n\nconst scopeContexts = createContextScope(SWITCH_NAME)\nconst [createSwitchContext] = scopeContexts\nexport const createSwitchScope = scopeContexts[1]\n\nconst [SwitchProvider, useSwitchContext] = createSwitchContext<{\n  checked: boolean\n  disabled?: boolean\n  size: SizeTokens\n}>(SWITCH_NAME)\n\n/* -------------------------------------------------------------------------------------------------\n * SwitchThumb\n * -----------------------------------------------------------------------------------------------*/\n\nconst THUMB_NAME = 'SwitchThumb'\n\nexport const SwitchThumbFrame = styled(ThemeableStack, {\n  name: 'SwitchThumb',\n  backgroundColor: '$background',\n  borderRadius: 1000,\n\n  variants: {\n    size: {\n      '...size': (val) => ({\n        height: getSwitchHeight(val),\n        width: getSwitchHeight(val),\n      }),\n    },\n  },\n\n  defaultVariants: {\n    size: '$4',\n  },\n})\n\nexport type SwitchThumbProps = GetProps<typeof SwitchThumbFrame>\n\nexport const SwitchThumb = SwitchThumbFrame.extractable(\n  React.forwardRef<React.ElementRef<'span'>, SwitchThumbProps>(\n    (props: ScopedProps<SwitchThumbProps, 'Switch'>, forwardedRef) => {\n      const { __scopeSwitch, ...thumbProps } = props\n      const { size, disabled, checked } = useSwitchContext(THUMB_NAME, __scopeSwitch)\n      return (\n        <SwitchThumbFrame\n          size={size}\n          data-state={getState(checked)}\n          data-disabled={disabled ? '' : undefined}\n          {...thumbProps}\n          x={\n            checked\n              ? getVariableValue(getSwitchWidth(size)) - getVariableValue(getSwitchHeight(size))\n              : 0\n          }\n          ref={forwardedRef}\n        />\n      )\n    }\n  )\n)\n\nSwitchThumb.displayName = THUMB_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * Switch\n * -----------------------------------------------------------------------------------------------*/\n\nexport const SwitchFrame = styled(XStack, {\n  name: 'Switch',\n  tag: 'button',\n  borderRadius: 1000,\n  borderWidth: 2,\n  borderColor: 'transparent',\n  backgroundColor: '$background',\n\n  focusStyle: {\n    borderColor: '$borderColorFocus',\n  },\n\n  variants: {\n    size: {\n      '...size': (val) => {\n        const height = calc(getSwitchHeight(val), '+', 4)\n        const width = calc(getSwitchWidth(val), '+', 4)\n        return {\n          height,\n          minHeight: height,\n          width,\n        }\n      },\n    },\n  },\n\n  defaultVariants: {\n    size: '$4',\n  },\n})\n\ntype SwitchButtonProps = GetProps<typeof SwitchFrame>\n\nexport type SwitchProps = SwitchButtonProps & {\n  labeledBy?: string\n  name?: string\n  value?: string\n  checked?: boolean\n  defaultChecked?: boolean\n  required?: boolean\n  onCheckedChange?(checked: boolean): void\n}\n\nexport const Switch = withStaticProperties(\n  SwitchFrame.extractable(\n    React.forwardRef<HTMLButtonElement | View, SwitchProps>(\n      (props: ScopedProps<SwitchProps, 'Switch'>, forwardedRef) => {\n        const {\n          __scopeSwitch,\n          labeledBy: ariaLabelledby,\n          name,\n          checked: checkedProp,\n          defaultChecked,\n          required,\n          disabled,\n          value = 'on',\n          onCheckedChange,\n          size = '$4',\n          ...switchProps\n        } = props\n        const [button, setButton] = React.useState<HTMLButtonElement | null>(null)\n        const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node as any))\n        const labelId = useLabelContext(button)\n        const labelledBy = ariaLabelledby || labelId\n        const hasConsumerStoppedPropagationRef = React.useRef(false)\n        // We set this to true by default so that events bubble to forms without JS (SSR)\n        const isFormControl = isWeb ? (button ? Boolean(button.closest('form')) : true) : false\n        const [checked = false, setChecked] = useControllableState({\n          prop: checkedProp,\n          defaultProp: defaultChecked || false,\n          onChange: onCheckedChange,\n        })\n\n        if (!isWeb) {\n          // eslint-disable-next-line react-hooks/rules-of-hooks\n          React.useEffect(() => {\n            if (!props.id) return\n            return registerFocusable(props.id, {\n              focus: () => {\n                setChecked((x) => !x)\n              },\n            })\n          }, [props.id, setChecked])\n        }\n\n        return (\n          <SwitchProvider scope={__scopeSwitch} checked={checked} disabled={disabled} size={size}>\n            <SwitchFrame\n              size={size}\n              // @ts-ignore\n              role=\"switch\"\n              aria-checked={checked}\n              aria-labelledby={labelledBy}\n              aria-required={required}\n              data-state={getState(checked)}\n              data-disabled={disabled ? '' : undefined}\n              disabled={disabled}\n              theme={checked ? 'active' : null}\n              themeShallow\n              // @ts-ignore\n              tabIndex={disabled ? undefined : 0}\n              // @ts-ignore\n              value={value}\n              {...switchProps}\n              ref={composedRefs}\n              onPress={(event) => {\n                props.onPress?.(event)\n                setChecked((prevChecked) => !prevChecked)\n                if (isWeb && isFormControl) {\n                  hasConsumerStoppedPropagationRef.current = event.isPropagationStopped()\n                  // if switch is in a form, stop propagation from the button so that we only propagate\n                  // one click event (from the input). We propagate changes from an input so that native\n                  // form validation works and form events reflect switch updates.\n                  if (!hasConsumerStoppedPropagationRef.current) event.stopPropagation()\n                }\n              }}\n            />\n            {isWeb && isFormControl && (\n              <BubbleInput\n                control={button}\n                bubbles={!hasConsumerStoppedPropagationRef.current}\n                name={name}\n                value={value}\n                checked={checked}\n                required={required}\n                disabled={disabled}\n                // We transform because the input is absolutely positioned but we have\n                // rendered it **after** the button. This pulls it back to sit on top\n                // of the button.\n                style={{ transform: 'translateX(-100%)' }}\n              />\n            )}\n          </SwitchProvider>\n        )\n      }\n    )\n  ),\n  {\n    Thumb: SwitchThumb,\n  }\n)\n\n/* ---------------------------------------------------------------------------------------------- */\n\ntype InputProps = any //Radix.ComponentPropsWithoutRef<'input'>\ninterface BubbleInputProps extends Omit<InputProps, 'checked'> {\n  checked: boolean\n  control: HTMLElement | null\n  bubbles: boolean\n}\n\n// TODO make this native friendly\nconst BubbleInput = (props: BubbleInputProps) => {\n  const { control, checked, bubbles = true, ...inputProps } = props\n  const ref = React.useRef<HTMLInputElement>(null)\n  const prevChecked = usePrevious(checked)\n  // const controlSize = useSize(control)\n\n  // Bubble checked change to parents (e.g form change event)\n  React.useEffect(() => {\n    const input = ref.current!\n    const inputProto = window.HTMLInputElement.prototype\n    const descriptor = Object.getOwnPropertyDescriptor(inputProto, 'checked') as PropertyDescriptor\n    const setChecked = descriptor.set\n    if (prevChecked !== checked && setChecked) {\n      const event = new Event('click', { bubbles })\n      setChecked.call(input, checked)\n      input.dispatchEvent(event)\n    }\n  }, [prevChecked, checked, bubbles])\n\n  return (\n    <input\n      type=\"checkbox\"\n      aria-hidden\n      defaultChecked={checked}\n      {...inputProps}\n      tabIndex={-1}\n      ref={ref}\n      style={{\n        ...props.style,\n        // ...controlSize,\n        position: 'absolute',\n        pointerEvents: 'none',\n        opacity: 0,\n        margin: 0,\n      }}\n    />\n  )\n}\n\nfunction getState(checked: boolean) {\n  return checked ? 'checked' : 'unchecked'\n}\n"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/switch",
-  "version": "1.0.1-beta.138",
+  "version": "1.0.1-beta.141",
   "sideEffects": [
     "*.css"
   ],
@@ -24,13 +24,13 @@
   },
   "dependencies": {
     "@radix-ui/react-use-previous": "^0.1.1",
-    "@tamagui/compose-refs": "^1.0.1-beta.138",
-    "@tamagui/core": "^1.0.1-beta.138",
-    "@tamagui/create-context": "^1.0.1-beta.138",
-    "@tamagui/focusable": "^1.0.1-beta.138",
-    "@tamagui/label": "^1.0.1-beta.138",
-    "@tamagui/stacks": "^1.0.1-beta.138",
-    "@tamagui/use-controllable-state": "^1.0.1-beta.138"
+    "@tamagui/compose-refs": "^1.0.1-beta.141",
+    "@tamagui/core": "^1.0.1-beta.141",
+    "@tamagui/create-context": "^1.0.1-beta.141",
+    "@tamagui/focusable": "^1.0.1-beta.141",
+    "@tamagui/label": "^1.0.1-beta.141",
+    "@tamagui/stacks": "^1.0.1-beta.141",
+    "@tamagui/use-controllable-state": "^1.0.1-beta.141"
   },
   "peerDependencies": {
     "react": "*",
@@ -38,7 +38,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "^1.0.1-beta.138",
+    "@tamagui/build": "^1.0.1-beta.141",
     "@types/react-native": "^0.69.2",
     "react": "*",
     "react-dom": "*",

package/src/Switch.draggable-tmp

@@ -0,0 +1,340 @@
+// via radix
+// https://github.com/radix-ui/primitives/blob/main/packages/react/switch/src/Switch.tsx
+
+import { usePrevious } from '@radix-ui/react-use-previous'
+import { useComposedRefs } from '@tamagui/compose-refs'
+import {
+  GetProps,
+  SizeTokens,
+  calc,
+  getSize,
+  getVariableValue,
+  isWeb,
+  styled,
+  withStaticProperties,
+} from '@tamagui/core'
+import { ScopedProps, createContextScope } from '@tamagui/create-context'
+import { registerFocusable } from '@tamagui/focusable'
+import { useLabelContext } from '@tamagui/label'
+import { ThemeableStack, XStack } from '@tamagui/stacks'
+import { useControllableState } from '@tamagui/use-controllable-state'
+import * as React from 'react'
+import { Animated, LayoutRectangle, PanResponder, View } from 'react-native'
+
+const SWITCH_NAME = 'Switch'
+
+// TODO make customizable
+const getSwitchHeight = (val: SizeTokens) => Math.round(getVariableValue(getSize(val)) * 0.65)
+const getSwitchWidth = (val: SizeTokens) => getSwitchHeight(val) * 2
+
+const scopeContexts = createContextScope(SWITCH_NAME)
+const [createSwitchContext] = scopeContexts
+export const createSwitchScope = scopeContexts[1]
+
+const [SwitchProvider, useSwitchContext] = createSwitchContext<{
+  checked: boolean
+  disabled?: boolean
+  size: SizeTokens
+  frameLayout?: LayoutRectangle
+}>(SWITCH_NAME)
+
+/* -------------------------------------------------------------------------------------------------
+ * SwitchThumb
+ * -----------------------------------------------------------------------------------------------*/
+
+const THUMB_NAME = 'SwitchThumb'
+
+export const SwitchThumbFrame = styled(ThemeableStack, {
+  name: 'SwitchThumb',
+  backgroundColor: '$background',
+  borderRadius: 1000,
+
+  variants: {
+    size: {
+      '...size': (val) => ({
+        height: getSwitchHeight(val),
+        width: getSwitchHeight(val),
+      }),
+    },
+  },
+
+  defaultVariants: {
+    size: '$4',
+  },
+})
+
+export type SwitchThumbProps = GetProps<typeof SwitchThumbFrame>
+
+export const SwitchThumb = SwitchThumbFrame.extractable(
+  React.forwardRef<React.ElementRef<'span'>, SwitchThumbProps>(
+    (props: ScopedProps<SwitchThumbProps, 'Switch'>, forwardedRef) => {
+      const { __scopeSwitch, ...thumbProps } = props
+      const { size, disabled, checked, frameLayout } = useSwitchContext(THUMB_NAME, __scopeSwitch)
+      const [position] = React.useState(new Animated.ValueXY(0))
+      const [thumbWidth, setThumbWidth] = React.useState(0)
+      const responder = React.useMemo(() => {
+        return PanResponder.create({
+          onStartShouldSetPanResponder: () => true,
+          onPanResponderMove: Animated.event(
+            [
+              null,
+              {
+                dx: position.x,
+              },
+            ],
+            {
+              useNativeDriver: false,
+            }
+          ),
+        })
+      }, [])
+
+      React.useEffect(() => {
+        position.addListener((val) => {
+          console.log('x', val)
+        })
+      }, [])
+
+      const maxMove =
+        getVariableValue(getSwitchWidth(size)) - getVariableValue(getSwitchHeight(size))
+
+      const maxDrag = (frameLayout?.width || 0) - thumbWidth
+
+      return (
+        <Animated.View
+          style={[
+            {
+              transform: [{ translateX: position.x }],
+            },
+          ]}
+        >
+          <SwitchThumbFrame
+            size={size}
+            data-state={getState(checked)}
+            data-disabled={disabled ? '' : undefined}
+            {...responder.panHandlers}
+            {...thumbProps}
+            onLayout={({ nativeEvent }) => {
+              console.log('thumb', nativeEvent.layout)
+              setThumbWidth(nativeEvent.layout.width)
+            }}
+            x={checked ? maxMove : 0}
+            ref={forwardedRef}
+          />
+        </Animated.View>
+      )
+    }
+  )
+)
+
+SwitchThumb.displayName = THUMB_NAME
+
+/* -------------------------------------------------------------------------------------------------
+ * Switch
+ * -----------------------------------------------------------------------------------------------*/
+
+export const SwitchFrame = styled(XStack, {
+  name: 'Switch',
+  tag: 'button',
+  borderRadius: 1000,
+  borderWidth: 2,
+  borderColor: 'transparent',
+  backgroundColor: '$background',
+
+  focusStyle: {
+    borderColor: '$borderColorFocus',
+  },
+
+  variants: {
+    size: {
+      '...size': (val) => {
+        const height = calc(getSwitchHeight(val), '+', 4)
+        const width = calc(getSwitchWidth(val), '+', 4)
+        return {
+          height,
+          minHeight: height,
+          width,
+        }
+      },
+    },
+  },
+
+  defaultVariants: {
+    size: '$4',
+  },
+})
+
+type SwitchButtonProps = GetProps<typeof SwitchFrame>
+
+export type SwitchProps = SwitchButtonProps & {
+  labeledBy?: string
+  name?: string
+  value?: string
+  checked?: boolean
+  defaultChecked?: boolean
+  required?: boolean
+  onCheckedChange?(checked: boolean): void
+}
+
+export const Switch = withStaticProperties(
+  SwitchFrame.extractable(
+    React.forwardRef<HTMLButtonElement | View, SwitchProps>(
+      (props: ScopedProps<SwitchProps, 'Switch'>, forwardedRef) => {
+        const {
+          __scopeSwitch,
+          labeledBy: ariaLabelledby,
+          name,
+          checked: checkedProp,
+          defaultChecked,
+          required,
+          disabled,
+          value = 'on',
+          onCheckedChange,
+          size = '$4',
+          ...switchProps
+        } = props
+        const [button, setButton] = React.useState<HTMLButtonElement | null>(null)
+        const composedRefs = useComposedRefs(forwardedRef, (node) => setButton(node as any))
+        const labelId = useLabelContext(button)
+        const labelledBy = ariaLabelledby || labelId
+        const hasConsumerStoppedPropagationRef = React.useRef(false)
+        const [frameLayout, setFrameLayout] = React.useState<LayoutRectangle>()
+        // 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 || false,
+          onChange: onCheckedChange,
+        })
+
+        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])
+        }
+
+        return (
+          <SwitchProvider
+            scope={__scopeSwitch}
+            checked={checked}
+            disabled={disabled}
+            size={size}
+            frameLayout={frameLayout}
+          >
+            <SwitchFrame
+              size={size}
+              onLayout={({ nativeEvent }) => {
+                console.log('?', nativeEvent.layout)
+                setFrameLayout(nativeEvent.layout)
+              }}
+              // @ts-ignore
+              role="switch"
+              aria-checked={checked}
+              aria-labelledby={labelledBy}
+              aria-required={required}
+              data-state={getState(checked)}
+              data-disabled={disabled ? '' : undefined}
+              disabled={disabled}
+              theme={checked ? 'active' : null}
+              themeShallow
+              // @ts-ignore
+              tabIndex={disabled ? undefined : 0}
+              // @ts-ignore
+              value={value}
+              {...switchProps}
+              ref={composedRefs}
+              onPress={(event) => {
+                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()
+                }
+              }}
+            />
+            {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%)' }}
+              />
+            )}
+          </SwitchProvider>
+        )
+      }
+    )
+  ),
+  {
+    Thumb: SwitchThumb,
+  }
+)
+
+/* ---------------------------------------------------------------------------------------------- */
+
+type InputProps = any //Radix.ComponentPropsWithoutRef<'input'>
+interface BubbleInputProps extends Omit<InputProps, 'checked'> {
+  checked: boolean
+  control: HTMLElement | null
+  bubbles: boolean
+}
+
+// TODO make this native friendly
+const BubbleInput = (props: BubbleInputProps) => {
+  const { control, checked, bubbles = true, ...inputProps } = props
+  const ref = React.useRef<HTMLInputElement>(null)
+  const prevChecked = usePrevious(checked)
+  // const controlSize = useSize(control)
+
+  // Bubble checked change to parents (e.g form change event)
+  React.useEffect(() => {
+    const input = ref.current!
+    const inputProto = window.HTMLInputElement.prototype
+    const descriptor = Object.getOwnPropertyDescriptor(inputProto, 'checked') as PropertyDescriptor
+    const setChecked = descriptor.set
+    if (prevChecked !== checked && setChecked) {
+      const event = new Event('click', { bubbles })
+      setChecked.call(input, checked)
+      input.dispatchEvent(event)
+    }
+  }, [prevChecked, checked, bubbles])
+
+  return (
+    <input
+      type="checkbox"
+      aria-hidden
+      defaultChecked={checked}
+      {...inputProps}
+      tabIndex={-1}
+      ref={ref}
+      style={{
+        ...props.style,
+        // ...controlSize,
+        position: 'absolute',
+        pointerEvents: 'none',
+        opacity: 0,
+        margin: 0,
+      }}
+    />
+  )
+}
+
+function getState(checked: boolean) {
+  return checked ? 'checked' : 'unchecked'
+}