@tamagui/toggle-group 1.69.3 → 1.71.0

package/dist/jsx/ToggleGroup.native.js

@@ -1,13 +1,13 @@
-import { createContextScope } from "@tamagui/create-context";
 import { registerFocusable } from "@tamagui/focusable";
 import { getFontSize } from "@tamagui/font-size";
 import { getSize } from "@tamagui/get-token";
 import { Group, useGroupItem } from "@tamagui/group";
 import { useGetThemedIcon } from "@tamagui/helpers-tamagui";
-import { RovingFocusGroup, createRovingFocusGroupScope } from "@tamagui/roving-focus";
+import { RovingFocusGroup } from "@tamagui/roving-focus";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import { useDirection } from "@tamagui/use-direction";
 import {
+  createStyledContext,
   getVariableValue,
   isWeb,
   styled,
@@ -16,19 +16,10 @@ import {
 } from "@tamagui/web";
 import React from "react";
 import { Toggle, ToggleFrame } from "./Toggle";
-const TOGGLE_GROUP_NAME = "ToggleGroup", [createToggleGroupContext, createToggleGroupScope] = createContextScope(
-  TOGGLE_GROUP_NAME,
-  [createRovingFocusGroupScope]
-), TOGGLE_GROUP_ITEM_NAME = "ToggleGroupItem", [createToggleGroupItemContext, createToggleGroupItemScope] = createContextScope(TOGGLE_GROUP_ITEM_NAME), [ToggleGroupItemProvider, useToggleGroupItemContext] = createToggleGroupContext(TOGGLE_GROUP_NAME), useToggleGroupItemScope = createToggleGroupItemScope(), ToggleGroupItem = ToggleFrame.extractable(
+const TOGGLE_GROUP_NAME = "ToggleGroup", TOGGLE_GROUP_ITEM_NAME = "ToggleGroupItem", TOGGLE_GROUP_CONTEXT = "ToggleGroup", { Provider: ToggleGroupItemProvider, useStyledContext: useToggleGroupItemContext } = createStyledContext(), { Provider: ToggleGroupContext, useStyledContext: useToggleGroupContext } = createStyledContext(), ToggleGroupItem = ToggleFrame.extractable(
   React.forwardRef(
     (props, forwardedRef) => {
-      const valueContext = useToggleGroupValueContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        props.__scopeToggleGroup
-      ), context = useToggleGroupContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        props.__scopeToggleGroup
-      ), __scopeToggleGroup = props.__scopeToggleGroup, rovingFocusGroupScope = useRovingFocusGroupScope(props.__scopeToggleGroup), pressed = valueContext.value.includes(props.value), disabled = context.disabled || props.disabled || !1, ref = React.useRef(null), groupItemProps = useGroupItem({ disabled }), size = props.size ?? context.size, sizeProps = props.unstyled ? {} : {
+      const { __scopeToggleGroup, ...rest } = props, valueContext = useToggleGroupValueContext(__scopeToggleGroup), context = useToggleGroupContext(__scopeToggleGroup), pressed = valueContext.value.includes(props.value), disabled = context.disabled || props.disabled || !1, ref = React.useRef(null), groupItemProps = useGroupItem({ disabled }), size = props.size ?? context.size, sizeProps = props.unstyled ? {} : {
         width: void 0,
         height: void 0,
         padding: getVariableValue(size) * 0.6
@@ -37,7 +28,7 @@ const TOGGLE_GROUP_NAME = "ToggleGroup", [createToggleGroupContext, createToggle
       const iconSize = (typeof size == "number" ? size * 0.7 : getFontSize(size)) * 1.2, theme = useTheme(), getThemedIcon = useGetThemedIcon({ size: iconSize, color: theme.color }), children = React.Children.toArray(props.children).map((child) => props.disablePassStyles || !React.isValidElement(child) ? child : getThemedIcon(child)), commonProps = { pressed, disabled, ...sizeProps, ...props, children };
       return <ToggleGroupItemProvider scope={__scopeToggleGroup}>{context.rovingFocus ? <RovingFocusGroup.Item
         asChild="except-style"
-        {...rovingFocusGroupScope}
+        __scopeRovingFocusGroup={__scopeToggleGroup || TOGGLE_GROUP_CONTEXT}
         focusable={!disabled}
         active={pressed}
       ><ToggleFrame
@@ -46,6 +37,7 @@ const TOGGLE_GROUP_NAME = "ToggleGroup", [createToggleGroupContext, createToggle
         disabled={disabled}
         ref={ref}
       ><ToggleGroupItemImpl
+        __scopeToggleGroup={__scopeToggleGroup}
         {...commonProps}
         ref={forwardedRef}
         {...groupItemProps}
@@ -54,7 +46,11 @@ const TOGGLE_GROUP_NAME = "ToggleGroup", [createToggleGroupContext, createToggle
         focusable={!disabled}
         disabled={disabled}
         ref={ref}
-      ><ToggleGroupItemImpl {...commonProps} ref={forwardedRef} /></ToggleFrame>}</ToggleGroupItemProvider>;
+      ><ToggleGroupItemImpl
+        __scopeToggleGroup={__scopeToggleGroup}
+        {...commonProps}
+        ref={forwardedRef}
+      /></ToggleFrame>}</ToggleGroupItemProvider>;
     }
   )
 );
@@ -62,10 +58,7 @@ ToggleGroupItem.displayName = TOGGLE_GROUP_ITEM_NAME;
 const ToggleGroupItemImpl = ToggleFrame.extractable(
   React.forwardRef(
     (props, forwardedRef) => {
-      const { __scopeToggleGroup, value, ...itemProps } = props, valueContext = useToggleGroupValueContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        __scopeToggleGroup
-      ), singleProps = {
+      const { __scopeToggleGroup, value, ...itemProps } = props, valueContext = useToggleGroupValueContext(__scopeToggleGroup), singleProps = {
         "aria-pressed": void 0
       }, typeProps = valueContext.type === "single" ? singleProps : void 0;
       return <Toggle
@@ -78,33 +71,38 @@ const ToggleGroupItemImpl = ToggleFrame.extractable(
       />;
     }
   )
-), useRovingFocusGroupScope = createRovingFocusGroupScope(), ToggleGroup = withStaticProperties(
-  React.forwardRef((props, forwardedRef) => {
-    const { type, ...toggleGroupProps } = props;
-    if (isWeb || React.useEffect(() => {
-      if (props.id)
-        return registerFocusable(props.id, {
-          // TODO: would be nice to focus on the first child later - could be done with reforest
-          // for now leaving it empty
-          focus: () => {
-          }
-        });
-    }, [props.id]), type === "single") {
-      const singleProps = toggleGroupProps;
-      return <ToggleGroupImplSingle {...singleProps} ref={forwardedRef} />;
-    }
-    if (type === "multiple") {
-      const multipleProps = toggleGroupProps;
-      return <ToggleGroupImplMultiple {...multipleProps} ref={forwardedRef} />;
+), ToggleGroup = withStaticProperties(
+  React.forwardRef(
+    (props, forwardedRef) => {
+      const { type, ...toggleGroupProps } = props;
+      if (isWeb || React.useEffect(() => {
+        if (props.id)
+          return registerFocusable(props.id, {
+            // TODO: would be nice to focus on the first child later - could be done with reforest
+            // for now leaving it empty
+            focus: () => {
+            }
+          });
+      }, [props.id]), type === "single") {
+        const singleProps = toggleGroupProps;
+        return <ToggleGroupImplSingle {...singleProps} ref={forwardedRef} />;
+      }
+      if (type === "multiple") {
+        const multipleProps = toggleGroupProps;
+        return <ToggleGroupImplMultiple {...multipleProps} ref={forwardedRef} />;
+      }
+      throw new Error(`Missing prop \`type\` expected on \`${TOGGLE_GROUP_NAME}\``);
     }
-    throw new Error(`Missing prop \`type\` expected on \`${TOGGLE_GROUP_NAME}\``);
-  }),
+  ),
   {
     Item: ToggleGroupItem
   }
 );
 ToggleGroup.displayName = TOGGLE_GROUP_NAME;
-const [ToggleGroupValueProvider, useToggleGroupValueContext] = createToggleGroupContext(TOGGLE_GROUP_NAME), ToggleGroupImplSingle = React.forwardRef((props, forwardedRef) => {
+const {
+  Provider: ToggleGroupValueProvider,
+  useStyledContext: useToggleGroupValueContext
+} = createStyledContext(), ToggleGroupImplSingle = React.forwardRef((props, forwardedRef) => {
   const {
     value: valueProp,
     defaultValue,
@@ -156,7 +154,7 @@ const [ToggleGroupValueProvider, useToggleGroupValueContext] = createToggleGroup
   ><ToggleGroupImpl {...toggleGroupMultipleProps} ref={forwardedRef} /></ToggleGroupValueProvider>;
 });
 ToggleGroup.displayName = TOGGLE_GROUP_NAME;
-const [ToggleGroupContext, useToggleGroupContext] = createToggleGroupContext(TOGGLE_GROUP_NAME), ToggleGroupImplElementFrame = styled(Group, {
+const ToggleGroupImplElementFrame = styled(Group, {
   name: TOGGLE_GROUP_NAME,
   variants: {
     unstyled: {
@@ -192,7 +190,7 @@ const [ToggleGroupContext, useToggleGroupContext] = createToggleGroupContext(TOG
         size: sizeProp = "$true",
         sizeAdjust = 0,
         ...toggleGroupProps
-      } = props, rovingFocusGroupScope = useRovingFocusGroupScope(__scopeToggleGroup), direction = useDirection(dir), commonProps = {
+      } = props, direction = useDirection(dir), commonProps = {
         role: "group",
         dir: direction,
         ...toggleGroupProps
@@ -208,7 +206,7 @@ const [ToggleGroupContext, useToggleGroupContext] = createToggleGroupContext(TOG
         size={size}
       >{rovingFocus ? <RovingFocusGroup
         asChild="except-style"
-        {...rovingFocusGroupScope}
+        __scopeRovingFocusGroup={__scopeToggleGroup || TOGGLE_GROUP_CONTEXT}
         orientation={orientation}
         dir={direction}
         loop={loop}
@@ -232,7 +230,6 @@ const [ToggleGroupContext, useToggleGroupContext] = createToggleGroupContext(TOG
   )
 );
 export {
-  ToggleGroup,
-  createToggleGroupScope
+  ToggleGroup
 };
 //# sourceMappingURL=ToggleGroup.js.map

package/dist/jsx/ToggleGroup.native.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/toggle-group",
-  "version": "1.69.3",
+  "version": "1.71.0",
   "sideEffects": [
     "*.css"
   ],
@@ -31,23 +31,23 @@
     }
   },
   "dependencies": {
-    "@tamagui/create-context": "1.69.3",
-    "@tamagui/focusable": "1.69.3",
-    "@tamagui/font-size": "1.69.3",
-    "@tamagui/get-token": "1.69.3",
-    "@tamagui/group": "1.69.3",
-    "@tamagui/helpers-tamagui": "1.69.3",
-    "@tamagui/roving-focus": "1.69.3",
-    "@tamagui/stacks": "1.69.3",
-    "@tamagui/use-controllable-state": "1.69.3",
-    "@tamagui/use-direction": "1.69.3",
-    "@tamagui/web": "1.69.3"
+    "@tamagui/create-context": "1.71.0",
+    "@tamagui/focusable": "1.71.0",
+    "@tamagui/font-size": "1.71.0",
+    "@tamagui/get-token": "1.71.0",
+    "@tamagui/group": "1.71.0",
+    "@tamagui/helpers-tamagui": "1.71.0",
+    "@tamagui/roving-focus": "1.71.0",
+    "@tamagui/stacks": "1.71.0",
+    "@tamagui/use-controllable-state": "1.71.0",
+    "@tamagui/use-direction": "1.71.0",
+    "@tamagui/web": "1.71.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.69.3",
+    "@tamagui/build": "1.71.0",
     "react": "^18.2.0"
   },
   "publishConfig": {

package/src/Toggle.tsx

@@ -98,34 +98,34 @@ const Toggle = ToggleFrame.extractable(
     })
 
     return (
-      <Theme name={pressed ? 'active' : null}>
-        <ToggleFrame
-          active={!props.unstyled ? pressed : undefined}
-          aria-pressed={pressed}
-          data-state={pressed ? 'on' : 'off'}
-          data-disabled={props.disabled ? '' : undefined}
-          {...buttonProps}
-          ref={forwardedRef}
-          onPress={composeEventHandlers(props.onPress ?? undefined, (event) => {
-            if (!props.disabled) {
-              setPressed(!pressed)
-            }
-          })}
-          // caught by onPress - no need for this
-          // {...(isWeb && {
-          //   onKeyDown: composeEventHandlers(
-          //     (props as React.HTMLProps<HTMLButtonElement>).onKeyDown,
-          //     (event) => {
-          //       if ([' ', 'Enter'].includes(event.key)) {
-          //         if (!props.disabled) {
-          //           setPressed(!pressed)
-          //         }
-          //       }
-          //     }
-          //   ),
-          // })}
-        />
-      </Theme>
+      <ToggleFrame
+        theme={pressed ? 'active' : null}
+        themeShallow
+        active={!props.unstyled ? pressed : undefined}
+        aria-pressed={pressed}
+        data-state={pressed ? 'on' : 'off'}
+        data-disabled={props.disabled ? '' : undefined}
+        {...buttonProps}
+        ref={forwardedRef}
+        onPress={composeEventHandlers(props.onPress ?? undefined, (event) => {
+          if (!props.disabled) {
+            setPressed(!pressed)
+          }
+        })}
+        // caught by onPress - no need for this
+        // {...(isWeb && {
+        //   onKeyDown: composeEventHandlers(
+        //     (props as React.HTMLProps<HTMLButtonElement>).onKeyDown,
+        //     (event) => {
+        //       if ([' ', 'Enter'].includes(event.key)) {
+        //         if (!props.disabled) {
+        //           setPressed(!pressed)
+        //         }
+        //       }
+        //     }
+        //   ),
+        // })}
+      />
     )
   })
 )

package/src/ToggleGroup.tsx

@@ -1,16 +1,16 @@
-import { Scope, createContextScope } from '@tamagui/create-context'
 import { registerFocusable } from '@tamagui/focusable'
 import { getFontSize } from '@tamagui/font-size'
 import { getSize } from '@tamagui/get-token'
 import { Group, GroupProps, useGroupItem } from '@tamagui/group'
 import { useGetThemedIcon } from '@tamagui/helpers-tamagui'
-import { RovingFocusGroup, createRovingFocusGroupScope } from '@tamagui/roving-focus'
+import { RovingFocusGroup } from '@tamagui/roving-focus'
 import { useControllableState } from '@tamagui/use-controllable-state'
 import { useDirection } from '@tamagui/use-direction'
 import {
   FontSizeTokens,
   GetProps,
   SizeTokens,
+  createStyledContext,
   getVariableValue,
   isWeb,
   styled,
@@ -22,23 +22,21 @@ import React from 'react'
 import { Toggle, ToggleFrame, ToggleProps } from './Toggle'
 
 const TOGGLE_GROUP_NAME = 'ToggleGroup'
-const [createToggleGroupContext, createToggleGroupScope] = createContextScope(
-  TOGGLE_GROUP_NAME,
-  [createRovingFocusGroupScope]
-)
 /* -------------------------------------------------------------------------------------------------
  * ToggleGroupItem
  * -----------------------------------------------------------------------------------------------*/
 
 const TOGGLE_GROUP_ITEM_NAME = 'ToggleGroupItem'
 
+const TOGGLE_GROUP_CONTEXT = 'ToggleGroup'
+
 type ToggleGroupItemContextValue = { disabled?: boolean }
 
-const [createToggleGroupItemContext, createToggleGroupItemScope] =
-  createContextScope(TOGGLE_GROUP_ITEM_NAME)
-const [ToggleGroupItemProvider, useToggleGroupItemContext] =
-  createToggleGroupContext<ToggleGroupItemContextValue>(TOGGLE_GROUP_NAME)
-const useToggleGroupItemScope = createToggleGroupItemScope()
+const { Provider: ToggleGroupItemProvider, useStyledContext: useToggleGroupItemContext } =
+  createStyledContext<ToggleGroupItemContextValue>()
+
+const { Provider: ToggleGroupContext, useStyledContext: useToggleGroupContext } =
+  createStyledContext<ToggleGroupContextValue>()
 
 type ToggleGroupItemElement = ToggleGroupItemImplElement
 
@@ -55,16 +53,9 @@ type ToggleGroupItemProps = GetProps<typeof ToggleFrame> & {
 const ToggleGroupItem = ToggleFrame.extractable(
   React.forwardRef<ToggleGroupItemElement, ToggleGroupItemProps>(
     (props: ScopedProps<ToggleGroupItemProps>, forwardedRef) => {
-      const valueContext = useToggleGroupValueContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        props.__scopeToggleGroup
-      )
-      const context = useToggleGroupContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        props.__scopeToggleGroup
-      )
-      const __scopeToggleGroup = props.__scopeToggleGroup
-      const rovingFocusGroupScope = useRovingFocusGroupScope(props.__scopeToggleGroup)
+      const { __scopeToggleGroup, ...rest } = props
+      const valueContext = useToggleGroupValueContext(__scopeToggleGroup)
+      const context = useToggleGroupContext(__scopeToggleGroup)
       const pressed = valueContext.value.includes(props.value)
       const disabled = context.disabled || props.disabled || false
       const ref = React.useRef<HTMLDivElement>(null)
@@ -109,7 +100,7 @@ const ToggleGroupItem = ToggleFrame.extractable(
           {context.rovingFocus ? (
             <RovingFocusGroup.Item
               asChild="except-style"
-              {...rovingFocusGroupScope}
+              __scopeRovingFocusGroup={__scopeToggleGroup || TOGGLE_GROUP_CONTEXT}
               focusable={!disabled}
               active={pressed}
             >
@@ -120,6 +111,7 @@ const ToggleGroupItem = ToggleFrame.extractable(
                 ref={ref}
               >
                 <ToggleGroupItemImpl
+                  __scopeToggleGroup={__scopeToggleGroup}
                   {...commonProps}
                   ref={forwardedRef}
                   {...groupItemProps}
@@ -133,7 +125,11 @@ const ToggleGroupItem = ToggleFrame.extractable(
               disabled={disabled}
               ref={ref}
             >
-              <ToggleGroupItemImpl {...commonProps} ref={forwardedRef} />
+              <ToggleGroupItemImpl
+                __scopeToggleGroup={__scopeToggleGroup}
+                {...commonProps}
+                ref={forwardedRef}
+              />
             </ToggleFrame>
           )}
         </ToggleGroupItemProvider>
@@ -158,13 +154,10 @@ type ToggleGroupItemImplProps = Omit<
 }
 
 const ToggleGroupItemImpl = ToggleFrame.extractable(
-  React.forwardRef<ToggleGroupItemImplElement, ToggleGroupItemImplProps>(
+  React.forwardRef<ToggleGroupItemImplElement, ScopedProps<ToggleGroupItemImplProps>>(
     (props: ScopedProps<ToggleGroupItemImplProps>, forwardedRef) => {
       const { __scopeToggleGroup, value, ...itemProps } = props
-      const valueContext = useToggleGroupValueContext(
-        TOGGLE_GROUP_ITEM_NAME,
-        __scopeToggleGroup
-      )
+      const valueContext = useToggleGroupValueContext(__scopeToggleGroup)
       const singleProps = {
         'aria-pressed': undefined,
       }
@@ -194,9 +187,7 @@ const ToggleGroupItemImpl = ToggleFrame.extractable(
  * ToggleGroup
  * -----------------------------------------------------------------------------------------------*/
 
-type ScopedProps<P> = P & { __scopeToggleGroup?: Scope }
-
-const useRovingFocusGroupScope = createRovingFocusGroupScope()
+type ScopedProps<P> = P & { __scopeToggleGroup?: string }
 
 type ToggleGroupElement = ToggleGroupImplSingleElement | ToggleGroupImplMultipleElement
 interface ToggleGroupSingleProps extends ToggleGroupImplSingleProps {
@@ -209,33 +200,35 @@ interface ToggleGroupMultipleProps extends ToggleGroupImplMultipleProps {
 type ToggleGroupProps = ToggleGroupSingleProps | ToggleGroupMultipleProps
 
 const ToggleGroup = withStaticProperties(
-  React.forwardRef<ToggleGroupElement, ToggleGroupProps>((props, forwardedRef) => {
-    const { type, ...toggleGroupProps } = props
-
-    if (!isWeb) {
-      // eslint-disable-next-line react-hooks/rules-of-hooks
-      React.useEffect(() => {
-        if (!props.id) return
-        return registerFocusable(props.id, {
-          // TODO: would be nice to focus on the first child later - could be done with reforest
-          // for now leaving it empty
-          focus: () => {},
-        })
-      }, [props.id])
-    }
+  React.forwardRef<ToggleGroupElement, ScopedProps<ToggleGroupProps>>(
+    (props, forwardedRef) => {
+      const { type, ...toggleGroupProps } = props
+
+      if (!isWeb) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        React.useEffect(() => {
+          if (!props.id) return
+          return registerFocusable(props.id, {
+            // TODO: would be nice to focus on the first child later - could be done with reforest
+            // for now leaving it empty
+            focus: () => {},
+          })
+        }, [props.id])
+      }
 
-    if (type === 'single') {
-      const singleProps = toggleGroupProps as ToggleGroupImplSingleProps
-      return <ToggleGroupImplSingle {...singleProps} ref={forwardedRef} />
-    }
+      if (type === 'single') {
+        const singleProps = toggleGroupProps as ToggleGroupImplSingleProps
+        return <ToggleGroupImplSingle {...singleProps} ref={forwardedRef} />
+      }
 
-    if (type === 'multiple') {
-      const multipleProps = toggleGroupProps as ToggleGroupImplMultipleProps
-      return <ToggleGroupImplMultiple {...multipleProps} ref={forwardedRef} />
-    }
+      if (type === 'multiple') {
+        const multipleProps = toggleGroupProps as ToggleGroupImplMultipleProps
+        return <ToggleGroupImplMultiple {...multipleProps} ref={forwardedRef} />
+      }
 
-    throw new Error(`Missing prop \`type\` expected on \`${TOGGLE_GROUP_NAME}\``)
-  }),
+      throw new Error(`Missing prop \`type\` expected on \`${TOGGLE_GROUP_NAME}\``)
+    }
+  ),
   {
     Item: ToggleGroupItem,
   }
@@ -253,8 +246,10 @@ type ToggleGroupValueContextValue = {
   onItemDeactivate(value: string): void
 }
 
-const [ToggleGroupValueProvider, useToggleGroupValueContext] =
-  createToggleGroupContext<ToggleGroupValueContextValue>(TOGGLE_GROUP_NAME)
+const {
+  Provider: ToggleGroupValueProvider,
+  useStyledContext: useToggleGroupValueContext,
+} = createStyledContext<ToggleGroupValueContextValue>()
 
 type ToggleGroupImplSingleElement = ToggleGroupImplElement
 interface ToggleGroupImplSingleProps extends ToggleGroupImplProps {
@@ -279,7 +274,7 @@ interface ToggleGroupImplSingleProps extends ToggleGroupImplProps {
 
 const ToggleGroupImplSingle = React.forwardRef<
   ToggleGroupImplSingleElement,
-  ToggleGroupImplSingleProps
+  ScopedProps<ToggleGroupImplSingleProps>
 >((props: ScopedProps<ToggleGroupImplSingleProps>, forwardedRef) => {
   const {
     value: valueProp,
@@ -381,9 +376,6 @@ type ToggleGroupContextValue = {
   size: SizeTokens
 }
 
-const [ToggleGroupContext, useToggleGroupContext] =
-  createToggleGroupContext<ToggleGroupContextValue>(TOGGLE_GROUP_NAME)
-
 type RovingFocusGroupProps = React.ComponentPropsWithoutRef<typeof RovingFocusGroup>
 type TamaguiElement = HTMLElement
 type ToggleGroupImplElement = TamaguiElement
@@ -438,7 +430,6 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
         sizeAdjust = 0,
         ...toggleGroupProps
       } = props
-      const rovingFocusGroupScope = useRovingFocusGroupScope(__scopeToggleGroup)
       const direction = useDirection(dir)
       const commonProps: ToggleGroupImplProps = {
         role: 'group',
@@ -462,7 +453,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
           {rovingFocus ? (
             <RovingFocusGroup
               asChild="except-style"
-              {...rovingFocusGroupScope}
+              __scopeRovingFocusGroup={__scopeToggleGroup || TOGGLE_GROUP_CONTEXT}
               orientation={orientation}
               dir={direction}
               loop={loop}
@@ -493,7 +484,7 @@ const ToggleGroupImpl = ToggleGroupImplElementFrame.extractable(
   )
 )
 
-export { ToggleGroup, createToggleGroupScope }
+export { ToggleGroup }
 export type {
   ToggleGroupItemProps,
   ToggleGroupMultipleProps,