@tamagui/accordion 1.70.0 → 1.71.0

package/dist/jsx/Accordion.js

@@ -1,24 +1,21 @@
-import { Collapsible, createCollapsibleScope } from "@tamagui/collapsible";
+import { Collapsible } from "@tamagui/collapsible";
 import { createCollection } from "@tamagui/collection";
-import { createContextScope } from "@tamagui/create-context";
 import { YStack } from "@tamagui/stacks";
 import { H1 } from "@tamagui/text";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import { useDirection } from "@tamagui/use-direction";
 import {
   composeEventHandlers,
+  createStyledContext,
   isWeb,
   styled,
   useComposedRefs,
   withStaticProperties
 } from "@tamagui/web";
 import * as React from "react";
-const ACCORDION_NAME = "Accordion", ACCORDION_KEYS = ["Home", "End", "ArrowDown", "ArrowUp", "ArrowLeft", "ArrowRight"], [Collection, useCollection, createCollectionScope] = createCollection(ACCORDION_NAME), [createAccordionContext, createAccordionScope] = createContextScope(
-  ACCORDION_NAME,
-  [createCollectionScope, createCollapsibleScope]
-), useCollapsibleScope = createCollapsibleScope(), AccordionComponent = React.forwardRef((props, forwardedRef) => {
+const ACCORDION_NAME = "Accordion", ACCORDION_KEYS = ["Home", "End", "ArrowDown", "ArrowUp", "ArrowLeft", "ArrowRight"], [Collection, useCollection] = createCollection(ACCORDION_NAME), ACCORDION_CONTEXT = "Accordion", AccordionComponent = React.forwardRef((props, forwardedRef) => {
   const { type, ...accordionProps } = props, singleProps = accordionProps, multipleProps = accordionProps;
-  return <Collection.Provider scope={props.__scopeAccordion}>{type === "multiple" ? <AccordionImplMultiple {...multipleProps} ref={forwardedRef} /> : <AccordionImplSingle {...singleProps} ref={forwardedRef} />}</Collection.Provider>;
+  return <Collection.Provider __scopeCollection={props.__scopeAccordion || ACCORDION_CONTEXT}>{type === "multiple" ? <AccordionImplMultiple {...multipleProps} ref={forwardedRef} /> : <AccordionImplSingle {...singleProps} ref={forwardedRef} />}</Collection.Provider>;
 });
 AccordionComponent.displayName = ACCORDION_NAME;
 AccordionComponent.propTypes = {
@@ -33,7 +30,10 @@ AccordionComponent.propTypes = {
     ) : null;
   }
 };
-const [AccordionValueProvider, useAccordionValueContext] = createAccordionContext(ACCORDION_NAME), [AccordionCollapsibleProvider, useAccordionCollapsibleContext] = createAccordionContext(ACCORDION_NAME, { collapsible: !1 }), AccordionImplSingle = React.forwardRef((props, forwardedRef) => {
+const { Provider: AccordionValueProvider, useStyledContext: useAccordionValueContext } = createStyledContext(), {
+  Provider: AccordionCollapsibleProvider,
+  useStyledContext: useAccordionCollapsibleContext
+} = createStyledContext(), AccordionImplSingle = React.forwardRef((props, forwardedRef) => {
   const {
     value: valueProp,
     defaultValue,
@@ -83,7 +83,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
     onItemOpen={handleItemOpen}
     onItemClose={handleItemClose}
   ><AccordionCollapsibleProvider scope={props.__scopeAccordion} collapsible={!0}><AccordionImpl {...accordionMultipleProps} ref={forwardedRef} /></AccordionCollapsibleProvider></AccordionValueProvider>;
-}), [AccordionImplProvider, useAccordionContext] = createAccordionContext(ACCORDION_NAME), AccordionImpl = React.forwardRef(
+}), { Provider: AccordionImplProvider, useStyledContext: useAccordionContext } = createStyledContext(), AccordionImpl = React.forwardRef(
   (props, forwardedRef) => {
     const {
       __scopeAccordion,
@@ -91,7 +91,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       dir,
       orientation = "vertical",
       ...accordionProps
-    } = props, accordionRef = React.useRef(null), composedRef = useComposedRefs(accordionRef, forwardedRef), getItems = useCollection(__scopeAccordion), isDirectionLTR = useDirection(dir) === "ltr", handleKeyDown = composeEventHandlers(
+    } = props, accordionRef = React.useRef(null), composedRef = useComposedRefs(accordionRef, forwardedRef), getItems = useCollection(__scopeAccordion || ACCORDION_CONTEXT), isDirectionLTR = useDirection(dir) === "ltr", handleKeyDown = composeEventHandlers(
       props.onKeyDown,
       (event) => {
         if (!ACCORDION_KEYS.includes(event.key))
@@ -137,7 +137,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       disabled={disabled}
       direction={dir}
       orientation={orientation}
-    ><Collection.Slot scope={__scopeAccordion}><YStack
+    ><Collection.Slot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}><YStack
       data-orientation={orientation}
       ref={composedRef}
       {...accordionProps}
@@ -146,9 +146,9 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       }}
     /></Collection.Slot></AccordionImplProvider>;
   }
-), ITEM_NAME = "AccordionItem", [AccordionItemProvider, useAccordionItemContext] = createAccordionContext(ITEM_NAME), AccordionItem = React.forwardRef(
+), ITEM_NAME = "AccordionItem", { Provider: AccordionItemProvider, useStyledContext: useAccordionItemContext } = createStyledContext(), AccordionItem = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeAccordion, value, ...accordionItemProps } = props, accordionContext = useAccordionContext(ITEM_NAME, __scopeAccordion), valueContext = useAccordionValueContext(ITEM_NAME, __scopeAccordion), collapsibleScope = useCollapsibleScope(__scopeAccordion), triggerId = React.useId(), open = value && valueContext.value.includes(value) || !1, disabled = accordionContext.disabled || props.disabled;
+    const { __scopeAccordion, value, ...accordionItemProps } = props, accordionContext = useAccordionContext(__scopeAccordion), valueContext = useAccordionValueContext(__scopeAccordion), triggerId = React.useId(), open = value && valueContext.value.includes(value) || !1, disabled = accordionContext.disabled || props.disabled;
     return <AccordionItemProvider
       scope={__scopeAccordion}
       open={open}
@@ -157,7 +157,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
     ><Collapsible
       data-orientation={accordionContext.orientation}
       data-state={open ? "open" : "closed"}
-      {...collapsibleScope}
+      __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
       {...accordionItemProps}
       ref={forwardedRef}
       disabled={disabled}
@@ -171,7 +171,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
 AccordionItem.displayName = ITEM_NAME;
 const HEADER_NAME = "AccordionHeader", AccordionHeader = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeAccordion, ...headerProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext(HEADER_NAME, __scopeAccordion);
+    const { __scopeAccordion, ...headerProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion);
     return <H1
       data-orientation={accordionContext.orientation}
       data-state={getState(itemContext.open)}
@@ -206,16 +206,13 @@ const AccordionTriggerFrame = styled(Collapsible.Trigger, {
   defaultVariants: {
     unstyled: !1
   }
-}), TRIGGER_NAME = "AccordionTrigger", AccordionTrigger = AccordionTriggerFrame.styleable(function(props, forwardedRef) {
-  const { __scopeAccordion, ...triggerProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext(TRIGGER_NAME, __scopeAccordion), collapsibleContext = useAccordionCollapsibleContext(
-    TRIGGER_NAME,
-    __scopeAccordion
-  ), collapsibleScope = useCollapsibleScope(__scopeAccordion);
-  return <Collection.ItemSlot scope={__scopeAccordion}><AccordionTriggerFrame
+}), AccordionTrigger = AccordionTriggerFrame.styleable(function(props, forwardedRef) {
+  const { __scopeAccordion, ...triggerProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion), collapsibleContext = useAccordionCollapsibleContext(__scopeAccordion);
+  return <Collection.ItemSlot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}><AccordionTriggerFrame
+    __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
     aria-disabled={itemContext.open && !collapsibleContext.collapsible || void 0}
     data-orientation={accordionContext.orientation}
     id={itemContext.triggerId}
-    {...collapsibleScope}
     {...triggerProps}
     ref={forwardedRef}
   /></Collection.ItemSlot>;
@@ -232,12 +229,12 @@ const AccordionTriggerFrame = styled(Collapsible.Trigger, {
     unstyled: !1
   }
 }), AccordionContent = AccordionContentFrame.styleable(function(props, forwardedRef) {
-  const { __scopeAccordion, ...contentProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext("AccordionContent", __scopeAccordion), collapsibleScope = useCollapsibleScope(__scopeAccordion);
+  const { __scopeAccordion, ...contentProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion);
   return <AccordionContentFrame
     role="region"
     aria-labelledby={itemContext.triggerId}
     data-orientation={accordionContext.orientation}
-    {...collapsibleScope}
+    __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
     {...contentProps}
     ref={forwardedRef}
   />;
@@ -252,7 +249,6 @@ const Accordion = withStaticProperties(AccordionComponent, {
   Item: AccordionItem
 });
 export {
-  Accordion,
-  createAccordionScope
+  Accordion
 };
 //# sourceMappingURL=Accordion.js.map

package/dist/jsx/Accordion.js.map

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

package/dist/jsx/Accordion.native.js

@@ -1,24 +1,21 @@
-import { Collapsible, createCollapsibleScope } from "@tamagui/collapsible";
+import { Collapsible } from "@tamagui/collapsible";
 import { createCollection } from "@tamagui/collection";
-import { createContextScope } from "@tamagui/create-context";
 import { YStack } from "@tamagui/stacks";
 import { H1 } from "@tamagui/text";
 import { useControllableState } from "@tamagui/use-controllable-state";
 import { useDirection } from "@tamagui/use-direction";
 import {
   composeEventHandlers,
+  createStyledContext,
   isWeb,
   styled,
   useComposedRefs,
   withStaticProperties
 } from "@tamagui/web";
 import * as React from "react";
-const ACCORDION_NAME = "Accordion", ACCORDION_KEYS = ["Home", "End", "ArrowDown", "ArrowUp", "ArrowLeft", "ArrowRight"], [Collection, useCollection, createCollectionScope] = createCollection(ACCORDION_NAME), [createAccordionContext, createAccordionScope] = createContextScope(
-  ACCORDION_NAME,
-  [createCollectionScope, createCollapsibleScope]
-), useCollapsibleScope = createCollapsibleScope(), AccordionComponent = React.forwardRef((props, forwardedRef) => {
+const ACCORDION_NAME = "Accordion", ACCORDION_KEYS = ["Home", "End", "ArrowDown", "ArrowUp", "ArrowLeft", "ArrowRight"], [Collection, useCollection] = createCollection(ACCORDION_NAME), ACCORDION_CONTEXT = "Accordion", AccordionComponent = React.forwardRef((props, forwardedRef) => {
   const { type, ...accordionProps } = props, singleProps = accordionProps, multipleProps = accordionProps;
-  return <Collection.Provider scope={props.__scopeAccordion}>{type === "multiple" ? <AccordionImplMultiple {...multipleProps} ref={forwardedRef} /> : <AccordionImplSingle {...singleProps} ref={forwardedRef} />}</Collection.Provider>;
+  return <Collection.Provider __scopeCollection={props.__scopeAccordion || ACCORDION_CONTEXT}>{type === "multiple" ? <AccordionImplMultiple {...multipleProps} ref={forwardedRef} /> : <AccordionImplSingle {...singleProps} ref={forwardedRef} />}</Collection.Provider>;
 });
 AccordionComponent.displayName = ACCORDION_NAME;
 AccordionComponent.propTypes = {
@@ -33,7 +30,10 @@ AccordionComponent.propTypes = {
     ) : null;
   }
 };
-const [AccordionValueProvider, useAccordionValueContext] = createAccordionContext(ACCORDION_NAME), [AccordionCollapsibleProvider, useAccordionCollapsibleContext] = createAccordionContext(ACCORDION_NAME, { collapsible: !1 }), AccordionImplSingle = React.forwardRef((props, forwardedRef) => {
+const { Provider: AccordionValueProvider, useStyledContext: useAccordionValueContext } = createStyledContext(), {
+  Provider: AccordionCollapsibleProvider,
+  useStyledContext: useAccordionCollapsibleContext
+} = createStyledContext(), AccordionImplSingle = React.forwardRef((props, forwardedRef) => {
   const {
     value: valueProp,
     defaultValue,
@@ -83,7 +83,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
     onItemOpen={handleItemOpen}
     onItemClose={handleItemClose}
   ><AccordionCollapsibleProvider scope={props.__scopeAccordion} collapsible={!0}><AccordionImpl {...accordionMultipleProps} ref={forwardedRef} /></AccordionCollapsibleProvider></AccordionValueProvider>;
-}), [AccordionImplProvider, useAccordionContext] = createAccordionContext(ACCORDION_NAME), AccordionImpl = React.forwardRef(
+}), { Provider: AccordionImplProvider, useStyledContext: useAccordionContext } = createStyledContext(), AccordionImpl = React.forwardRef(
   (props, forwardedRef) => {
     const {
       __scopeAccordion,
@@ -91,7 +91,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       dir,
       orientation = "vertical",
       ...accordionProps
-    } = props, accordionRef = React.useRef(null), composedRef = useComposedRefs(accordionRef, forwardedRef), getItems = useCollection(__scopeAccordion), isDirectionLTR = useDirection(dir) === "ltr", handleKeyDown = composeEventHandlers(
+    } = props, accordionRef = React.useRef(null), composedRef = useComposedRefs(accordionRef, forwardedRef), getItems = useCollection(__scopeAccordion || ACCORDION_CONTEXT), isDirectionLTR = useDirection(dir) === "ltr", handleKeyDown = composeEventHandlers(
       props.onKeyDown,
       (event) => {
         var _a;
@@ -141,7 +141,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       disabled={disabled}
       direction={dir}
       orientation={orientation}
-    ><Collection.Slot scope={__scopeAccordion}><YStack
+    ><Collection.Slot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}><YStack
       data-orientation={orientation}
       ref={composedRef}
       {...accordionProps}
@@ -150,9 +150,9 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
       }}
     /></Collection.Slot></AccordionImplProvider>;
   }
-), ITEM_NAME = "AccordionItem", [AccordionItemProvider, useAccordionItemContext] = createAccordionContext(ITEM_NAME), AccordionItem = React.forwardRef(
+), ITEM_NAME = "AccordionItem", { Provider: AccordionItemProvider, useStyledContext: useAccordionItemContext } = createStyledContext(), AccordionItem = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeAccordion, value, ...accordionItemProps } = props, accordionContext = useAccordionContext(ITEM_NAME, __scopeAccordion), valueContext = useAccordionValueContext(ITEM_NAME, __scopeAccordion), collapsibleScope = useCollapsibleScope(__scopeAccordion), triggerId = React.useId(), open = value && valueContext.value.includes(value) || !1, disabled = accordionContext.disabled || props.disabled;
+    const { __scopeAccordion, value, ...accordionItemProps } = props, accordionContext = useAccordionContext(__scopeAccordion), valueContext = useAccordionValueContext(__scopeAccordion), triggerId = React.useId(), open = value && valueContext.value.includes(value) || !1, disabled = accordionContext.disabled || props.disabled;
     return <AccordionItemProvider
       scope={__scopeAccordion}
       open={open}
@@ -161,7 +161,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
     ><Collapsible
       data-orientation={accordionContext.orientation}
       data-state={open ? "open" : "closed"}
-      {...collapsibleScope}
+      __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
       {...accordionItemProps}
       ref={forwardedRef}
       disabled={disabled}
@@ -175,7 +175,7 @@ const [AccordionValueProvider, useAccordionValueContext] = createAccordionContex
 AccordionItem.displayName = ITEM_NAME;
 const HEADER_NAME = "AccordionHeader", AccordionHeader = React.forwardRef(
   (props, forwardedRef) => {
-    const { __scopeAccordion, ...headerProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext(HEADER_NAME, __scopeAccordion);
+    const { __scopeAccordion, ...headerProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion);
     return <H1
       data-orientation={accordionContext.orientation}
       data-state={getState(itemContext.open)}
@@ -210,16 +210,13 @@ const AccordionTriggerFrame = styled(Collapsible.Trigger, {
   defaultVariants: {
     unstyled: !1
   }
-}), TRIGGER_NAME = "AccordionTrigger", AccordionTrigger = AccordionTriggerFrame.styleable(function(props, forwardedRef) {
-  const { __scopeAccordion, ...triggerProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext(TRIGGER_NAME, __scopeAccordion), collapsibleContext = useAccordionCollapsibleContext(
-    TRIGGER_NAME,
-    __scopeAccordion
-  ), collapsibleScope = useCollapsibleScope(__scopeAccordion);
-  return <Collection.ItemSlot scope={__scopeAccordion}><AccordionTriggerFrame
+}), AccordionTrigger = AccordionTriggerFrame.styleable(function(props, forwardedRef) {
+  const { __scopeAccordion, ...triggerProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion), collapsibleContext = useAccordionCollapsibleContext(__scopeAccordion);
+  return <Collection.ItemSlot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}><AccordionTriggerFrame
+    __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
     aria-disabled={itemContext.open && !collapsibleContext.collapsible || void 0}
     data-orientation={accordionContext.orientation}
     id={itemContext.triggerId}
-    {...collapsibleScope}
     {...triggerProps}
     ref={forwardedRef}
   /></Collection.ItemSlot>;
@@ -236,12 +233,12 @@ const AccordionTriggerFrame = styled(Collapsible.Trigger, {
     unstyled: !1
   }
 }), AccordionContent = AccordionContentFrame.styleable(function(props, forwardedRef) {
-  const { __scopeAccordion, ...contentProps } = props, accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion), itemContext = useAccordionItemContext("AccordionContent", __scopeAccordion), collapsibleScope = useCollapsibleScope(__scopeAccordion);
+  const { __scopeAccordion, ...contentProps } = props, accordionContext = useAccordionContext(__scopeAccordion), itemContext = useAccordionItemContext(__scopeAccordion);
   return <AccordionContentFrame
     role="region"
     aria-labelledby={itemContext.triggerId}
     data-orientation={accordionContext.orientation}
-    {...collapsibleScope}
+    __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
     {...contentProps}
     ref={forwardedRef}
   />;
@@ -256,7 +253,6 @@ const Accordion = withStaticProperties(AccordionComponent, {
   Item: AccordionItem
 });
 export {
-  Accordion,
-  createAccordionScope
+  Accordion
 };
 //# sourceMappingURL=Accordion.js.map

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/Accordion.tsx"],
-  "mappings": "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",
+  "mappings": "AAAA,SAAS,mBAAmB;AAC5B,SAAS,wBAAwB;AACjC,SAAS,cAAc;AACvB,SAAS,UAAc;AACvB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAC7B;AAAA,EAKE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,YAAY,WAAW;AAQvB,MAAM,iBAAiB,aACjB,iBAAiB,CAAC,QAAQ,OAAO,aAAa,WAAW,aAAa,YAAY,GAElF,CAAC,YAAY,aAAa,IAAI,iBAAmC,cAAc,GAY/E,oBAAoB,aAEpB,qBAAqB,MAAM,WAG/B,CAAC,OAAmE,iBAAiB;AACrF,QAAM,EAAE,MAAM,GAAG,eAAe,IAAI,OAC9B,cAAc,gBACd,gBAAgB;AAEtB,SACE,CAAC,WAAW,SAAS,mBAAmB,MAAM,oBAAoB,oBAC/D,SAAS,aACR,CAAC,0BAA0B,eAAe,KAAK,cAAc,KAE7D,CAAC,wBAAwB,aAAa,KAAK,cAAc,GAE7D,EANC,WAAW;AAQhB,CAAC;AAED,mBAAmB,cAAc;AAEjC,mBAAmB,YAAY;AAAA,EAC7B,KAAK,OAAO;AACV,UAAM,QAAQ,MAAM,SAAS,MAAM;AACnC,WAAI,MAAM,QAAQ,CAAC,CAAC,UAAU,UAAU,EAAE,SAAS,MAAM,IAAI,IACpD,IAAI;AAAA,MACT;AAAA,IACF,IAEE,MAAM,SAAS,cAAc,OAAO,SAAU,WACzC,IAAI;AAAA,MACT;AAAA,IACF,IAEE,MAAM,SAAS,YAAY,MAAM,QAAQ,KAAK,IACzC,IAAI;AAAA,MACT;AAAA,IACF,IAEK;AAAA,EACT;AACF;AAUA,MAAM,EAAE,UAAU,wBAAwB,kBAAkB,yBAAyB,IACnF,oBAAgD,GAE5C;AAAA,EACJ,UAAU;AAAA,EACV,kBAAkB;AACpB,IAAI,oBAAoB,GAyBlB,sBAAsB,MAAM,WAGhC,CAAC,OAA8C,iBAAiB;AAChE,QAAM;AAAA,IACJ,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,gBAAgB,MAAM;AAAA,IAAC;AAAA,IACvB,cAAc;AAAA,IACd,GAAG;AAAA,EACL,IAAI,OAEE,CAAC,OAAO,QAAQ,IAAI,qBAAqB;AAAA,IAC7C,MAAM;AAAA,IACN,aAAa,gBAAgB;AAAA,IAC7B,UAAU;AAAA,EACZ,CAAC;AAED,SACE,CAAC;AAAA,IACC,OAAO,MAAM;AAAA,IACb,OAAO,QAAQ,CAAC,KAAK,IAAI,CAAC;AAAA,IAC1B,YAAY;AAAA,IACZ,aAAa,MAAM;AAAA,MACjB,MAAM,eAAe,SAAS,EAAE;AAAA,MAChC,CAAC,UAAU,WAAW;AAAA,IACxB;AAAA,GAEA,CAAC;AAAA,IACC,OAAO,MAAM;AAAA,IACb,aAAa;AAAA,GAEb,CAAC,kBAAkB,sBAAsB,KAAK,cAAc,EAC9D,EALC,6BAMH,EAfC;AAiBL,CAAC,GAoBK,wBAAwB,MAAM,WAGlC,CAAC,OAAgD,iBAAiB;AAClE,QAAM;AAAA,IACJ,OAAO;AAAA,IACP;AAAA,IACA,gBAAgB,MAAM;AAAA,IAAC;AAAA,IACvB,GAAG;AAAA,EACL,IAAI,OAEE,CAAC,OAAO,QAAQ,IAAI,qBAAqB;AAAA,IAC7C,MAAM;AAAA,IACN,aAAa,gBAAgB,CAAC;AAAA,IAC9B,UAAU;AAAA,EACZ,CAAC,GAEK,iBAAiB,MAAM;AAAA,IAC3B,CAAC,cAAsB,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,WAAW,SAAS,CAAC;AAAA,IAC7E,CAAC,QAAQ;AAAA,EACX,GAEM,kBAAkB,MAAM;AAAA,IAC5B,CAAC,cACC,SAAS,CAAC,YAAY,CAAC,MAAM,UAAU,OAAO,CAACA,WAAUA,WAAU,SAAS,CAAC;AAAA,IAC/E,CAAC,QAAQ;AAAA,EACX;AAEA,SACE,CAAC;AAAA,IACC,OAAO,MAAM;AAAA,IACb,OAAO,SAAS,CAAC;AAAA,IACjB,YAAY;AAAA,IACZ,aAAa;AAAA,GAEb,CAAC,6BAA6B,OAAO,MAAM,kBAAkB,aAAa,IACxE,CAAC,kBAAkB,wBAAwB,KAAK,cAAc,EAChE,EAFC,6BAGH,EATC;AAWL,CAAC,GAUK,EAAE,UAAU,uBAAuB,kBAAkB,oBAAoB,IAC7E,oBAA+C,GA2B3C,gBAAgB,MAAM;AAAA,EAC1B,CAAC,OAAwC,iBAAiB;AACxD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,cAAc;AAAA,MACd,GAAG;AAAA,IACL,IAAI,OAEE,eAAe,MAAM,OAA6B,IAAI,GACtD,cAAc,gBAAgB,cAAc,YAAY,GACxD,WAAW,cAAc,oBAAoB,iBAAiB,GAE9D,iBADY,aAAa,GAAG,MACG,OAC/B,gBAAgB;AAAA,MACnB,MAAc;AAAA,MACf,CAAC,UAAyB;AArRhC;AAsRQ,YAAI,CAAC,eAAe,SAAS,MAAM,GAAG;AAAG;AACzC,cAAM,SAAS,MAAM,QACf,oBAAoB,SAAS,EAAE,OAAO,CAAC,SAAS;AACpD,gBAAM,KAAK,KAAK,IAAI;AACpB,iBAAO,EAAC,iBAAI;AAAA,QACd,CAAC,GACK,eAAe,kBAAkB;AAAA,UACrC,CAAC,SAAS,KAAK,IAAI,YAAY;AAAA,QACjC,GACM,eAAe,kBAAkB;AAEvC,YAAI,iBAAiB;AAAI;AAGzB,cAAM,eAAe;AAErB,YAAI,YAAY;AAChB,cAAM,YAAY,GACZ,WAAW,eAAe,GAE1B,WAAW,MAAM;AACrB,sBAAY,eAAe,GACvB,YAAY,aACd,YAAY;AAAA,QAEhB,GAEM,WAAW,MAAM;AACrB,sBAAY,eAAe,GACvB,YAAY,cACd,YAAY;AAAA,QAEhB;AAEA,gBAAQ,MAAM,KAAK;AAAA,UACjB,KAAK;AACH,wBAAY;AACZ;AAAA,UACF,KAAK;AACH,wBAAY;AACZ;AAAA,UACF,KAAK;AACH,YAAI,gBAAgB,iBACd,iBACF,SAAS,IAET,SAAS;AAGb;AAAA,UACF,KAAK;AACH,YAAI,gBAAgB,cAClB,SAAS;AAEX;AAAA,UACF,KAAK;AACH,YAAI,gBAAgB,iBACd,iBACF,SAAS,IAET,SAAS;AAGb;AAAA,UACF,KAAK;AACH,YAAI,gBAAgB,cAClB,SAAS;AAEX;AAAA,QACJ;AAEA,cAAM,eAAe,YAAY;AACjC,gCAAkB,YAAY,EAAE,IAAI,YAApC,WAA6C;AAAA,MAC/C;AAAA,IACF;AAEA,WACE,CAAC;AAAA,MACC,OAAO;AAAA,MACP,UAAU;AAAA,MACV,WAAW;AAAA,MACX,aAAa;AAAA,KAEb,CAAC,WAAW,KAAK,mBAAmB,oBAAoB,mBACtD,CAAC;AAAA,MACC,kBAAkB;AAAA,MAClB,KAAK;AAAA,UACD;AAAA,UACC,SAAS;AAAA,QACZ,WAAW;AAAA,MACb;AAAA,IACF,EACF,EATC,WAAW,KAUd,EAhBC;AAAA,EAkBL;AACF,GAMM,YAAY,iBAGZ,EAAE,UAAU,uBAAuB,kBAAkB,wBAAwB,IACjF,oBAA+C,GAqB3C,gBAAgB,MAAM;AAAA,EAC1B,CAAC,OAAwC,iBAAiB;AACxD,UAAM,EAAE,kBAAkB,OAAO,GAAG,mBAAmB,IAAI,OACrD,mBAAmB,oBAAoB,gBAAgB,GACvD,eAAe,yBAAyB,gBAAgB,GACxD,YAAY,MAAM,MAAM,GACxB,OAAQ,SAAS,aAAa,MAAM,SAAS,KAAK,KAAM,IACxD,WAAW,iBAAiB,YAAY,MAAM;AAEpD,WACE,CAAC;AAAA,MACC,OAAO;AAAA,MACP,MAAM;AAAA,MACN,UAAU;AAAA,MACV,WAAW;AAAA,KAEX,CAAC;AAAA,MACC,kBAAkB,iBAAiB;AAAA,MACnC,YAAY,OAAO,SAAS;AAAA,MAC5B,oBAAoB,oBAAoB;AAAA,UACpC;AAAA,MACJ,KAAK;AAAA,MACL,UAAU;AAAA,MACV,MAAM;AAAA,MACN,cAAc,CAACC,UAAS;AACtB,QAAIA,QACF,aAAa,WAAW,KAAK,IAE7B,aAAa,YAAY,KAAK;AAAA,MAElC;AAAA,IACF,EACF,EAtBC;AAAA,EAwBL;AACF;AAEA,cAAc,cAAc;AAM5B,MAAM,cAAc,mBAUd,kBAAkB,MAAM;AAAA,EAC5B,CAAC,OAA0C,iBAAiB;AAC1D,UAAM,EAAE,kBAAkB,GAAG,YAAY,IAAI,OACvC,mBAAmB,oBAAoB,gBAAgB,GACvD,cAAc,wBAAwB,gBAAgB;AAC5D,WACE,CAAC;AAAA,MACC,kBAAkB,iBAAiB;AAAA,MACnC,YAAY,SAAS,YAAY,IAAI;AAAA,MACrC,eAAe,YAAY,WAAW,KAAK;AAAA,UACvC;AAAA,MACJ,KAAK;AAAA,IACP;AAAA,EAEJ;AACF;AAEA,gBAAgB,cAAc;AAM9B,MAAM,wBAAwB,OAAO,YAAY,SAAS;AAAA,EACxD,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,QAAQ;AAAA,QACR,iBAAiB;AAAA,QACjB,aAAa;AAAA,QACb,aAAa;AAAA,QACb,SAAS;AAAA,QAET,YAAY;AAAA,UACV,iBAAiB;AAAA,QACnB;AAAA,QAEA,YAAY;AAAA,UACV,iBAAiB;AAAA,QACnB;AAAA,QAEA,YAAY;AAAA,UACV,iBAAiB;AAAA,QACnB;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC,GASK,mBAAmB,sBAAsB,UAAU,SACvD,OACA,cACA;AACA,QAAM,EAAE,kBAAkB,GAAG,aAAa,IAAI,OACxC,mBAAmB,oBAAoB,gBAAgB,GACvD,cAAc,wBAAwB,gBAAgB,GACtD,qBAAqB,+BAA+B,gBAAgB;AAE1E,SACE,CAAC,WAAW,SAAS,mBAAmB,oBAAoB,mBAC1D,CAAC;AAAA,IAEC,oBAAoB,oBAAoB;AAAA,IACxC,eAAgB,YAAY,QAAQ,CAAC,mBAAmB,eAAgB;AAAA,IACxE,kBAAkB,iBAAiB;AAAA,IACnC,IAAI,YAAY;AAAA,QACZ;AAAA,IACJ,KAAK;AAAA,EACP,EACF,EAVC,WAAW;AAYhB,CAAC,GAMK,wBAAwB,OAAO,YAAY,SAAS;AAAA,EACxD,UAAU;AAAA,IACR,UAAU;AAAA,MACR,OAAO;AAAA,QACL,SAAS;AAAA,QACT,iBAAiB;AAAA,MACnB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC,GAOK,mBAAmB,sBAAsB,UAAU,SACvD,OACA,cACA;AACA,QAAM,EAAE,kBAAkB,GAAG,aAAa,IAAI,OACxC,mBAAmB,oBAAoB,gBAAgB,GACvD,cAAc,wBAAwB,gBAAgB;AAC5D,SACE,CAAC;AAAA,IACC,KAAK;AAAA,IACL,iBAAiB,YAAY;AAAA,IAC7B,kBAAkB,iBAAiB;AAAA,IACnC,oBAAoB,oBAAoB;AAAA,QACpC;AAAA,IACJ,KAAK;AAAA,EACP;AAEJ,CAAC;AAID,SAAS,SAAS,MAAgB;AAChC,SAAO,OAAO,SAAS;AACzB;AACA,MAAM,YAAY,qBAAqB,oBAAoB;AAAA,EACzD,SAAS;AAAA,EACT,QAAQ;AAAA,EACR,SAAS;AAAA,EACT,MAAM;AACR,CAAC;",
   "names": ["value", "open"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/accordion",
-  "version": "1.70.0",
+  "version": "1.71.0",
   "sideEffects": [
     "*.css"
   ],
@@ -22,20 +22,20 @@
     "lint:fix": "../../node_modules/.bin/biome check --apply-unsafe src"
   },
   "dependencies": {
-    "@tamagui/collapsible": "1.70.0",
-    "@tamagui/collection": "1.70.0",
-    "@tamagui/compose-refs": "1.70.0",
-    "@tamagui/core": "1.70.0",
-    "@tamagui/create-context": "1.70.0",
-    "@tamagui/polyfill-dev": "1.70.0",
-    "@tamagui/stacks": "1.70.0",
-    "@tamagui/use-controllable-state": "1.70.0"
+    "@tamagui/collapsible": "1.71.0",
+    "@tamagui/collection": "1.71.0",
+    "@tamagui/compose-refs": "1.71.0",
+    "@tamagui/core": "1.71.0",
+    "@tamagui/create-context": "1.71.0",
+    "@tamagui/polyfill-dev": "1.71.0",
+    "@tamagui/stacks": "1.71.0",
+    "@tamagui/use-controllable-state": "1.71.0"
   },
   "peerDependencies": {
     "react": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.70.0",
+    "@tamagui/build": "1.71.0",
     "react": "^18.2.0"
   },
   "publishConfig": {

package/src/Accordion.tsx

@@ -1,7 +1,5 @@
-import { Collapsible, createCollapsibleScope } from '@tamagui/collapsible'
+import { Collapsible } from '@tamagui/collapsible'
 import { createCollection } from '@tamagui/collection'
-import type { Scope } from '@tamagui/create-context'
-import { createContextScope } from '@tamagui/create-context'
 import { YStack } from '@tamagui/stacks'
 import { H1, H3 } from '@tamagui/text'
 import { useControllableState } from '@tamagui/use-controllable-state'
@@ -12,6 +10,7 @@ import {
   Stack,
   TamaguiElement,
   composeEventHandlers,
+  createStyledContext,
   isWeb,
   styled,
   useComposedRefs,
@@ -28,16 +27,10 @@ type Direction = 'ltr' | 'rtl'
 const ACCORDION_NAME = 'Accordion'
 const ACCORDION_KEYS = ['Home', 'End', 'ArrowDown', 'ArrowUp', 'ArrowLeft', 'ArrowRight']
 
-const [Collection, useCollection, createCollectionScope] =
-  createCollection<AccordionTrigger>(ACCORDION_NAME)
+const [Collection, useCollection] = createCollection<AccordionTrigger>(ACCORDION_NAME)
 
-type ScopedProps<P> = P & { __scopeAccordion?: Scope }
-const [createAccordionContext, createAccordionScope] = createContextScope(
-  ACCORDION_NAME,
-  [createCollectionScope, createCollapsibleScope]
-)
+type ScopedProps<P> = P & { __scopeAccordion?: string }
 
-const useCollapsibleScope = createCollapsibleScope()
 type AccordionElement = AccordionImplMultipleElement | AccordionImplSingleElement
 interface AccordionSingleProps extends AccordionImplSingleProps {
   type: 'single'
@@ -46,16 +39,18 @@ interface AccordionMultipleProps extends AccordionImplMultipleProps {
   type: 'multiple'
 }
 
+const ACCORDION_CONTEXT = 'Accordion'
+
 const AccordionComponent = React.forwardRef<
   AccordionElement,
-  AccordionSingleProps | AccordionMultipleProps
+  ScopedProps<AccordionSingleProps | AccordionMultipleProps>
 >((props: ScopedProps<AccordionSingleProps | AccordionMultipleProps>, forwardedRef) => {
   const { type, ...accordionProps } = props
   const singleProps = accordionProps as AccordionImplSingleProps
   const multipleProps = accordionProps as AccordionImplMultipleProps
 
   return (
-    <Collection.Provider scope={props.__scopeAccordion}>
+    <Collection.Provider __scopeCollection={props.__scopeAccordion || ACCORDION_CONTEXT}>
       {type === 'multiple' ? (
         <AccordionImplMultiple {...multipleProps} ref={forwardedRef} />
       ) : (
@@ -97,11 +92,13 @@ type AccordionValueContextValue = {
   onItemClose(value: string): void
 }
 
-const [AccordionValueProvider, useAccordionValueContext] =
-  createAccordionContext<AccordionValueContextValue>(ACCORDION_NAME)
+const { Provider: AccordionValueProvider, useStyledContext: useAccordionValueContext } =
+  createStyledContext<AccordionValueContextValue>()
 
-const [AccordionCollapsibleProvider, useAccordionCollapsibleContext] =
-  createAccordionContext(ACCORDION_NAME, { collapsible: false })
+const {
+  Provider: AccordionCollapsibleProvider,
+  useStyledContext: useAccordionCollapsibleContext,
+} = createStyledContext()
 
 type AccordionImplSingleElement = AccordionImplElement
 
@@ -128,7 +125,7 @@ interface AccordionImplSingleProps extends AccordionImplProps {
 
 const AccordionImplSingle = React.forwardRef<
   AccordionImplSingleElement,
-  AccordionImplSingleProps
+  ScopedProps<AccordionImplSingleProps>
 >((props: ScopedProps<AccordionImplSingleProps>, forwardedRef) => {
   const {
     value: valueProp,
@@ -185,7 +182,7 @@ interface AccordionImplMultipleProps extends AccordionImplProps {
 
 const AccordionImplMultiple = React.forwardRef<
   AccordionImplMultipleElement,
-  AccordionImplMultipleProps
+  ScopedProps<AccordionImplMultipleProps>
 >((props: ScopedProps<AccordionImplMultipleProps>, forwardedRef) => {
   const {
     value: valueProp,
@@ -233,8 +230,8 @@ type AccordionImplContextValue = {
   orientation: AccordionImplProps['orientation']
 }
 
-const [AccordionImplProvider, useAccordionContext] =
-  createAccordionContext<AccordionImplContextValue>(ACCORDION_NAME)
+const { Provider: AccordionImplProvider, useStyledContext: useAccordionContext } =
+  createStyledContext<AccordionImplContextValue>()
 
 type AccordionImplElement = TamaguiElement
 type PrimitiveDivProps = React.ComponentPropsWithoutRef<typeof Stack>
@@ -273,7 +270,7 @@ const AccordionImpl = React.forwardRef<AccordionImplElement, AccordionImplProps>
 
     const accordionRef = React.useRef<AccordionImplElement>(null)
     const composedRef = useComposedRefs(accordionRef, forwardedRef)
-    const getItems = useCollection(__scopeAccordion)
+    const getItems = useCollection(__scopeAccordion || ACCORDION_CONTEXT)
     const direction = useDirection(dir)
     const isDirectionLTR = direction === 'ltr'
     const handleKeyDown = composeEventHandlers(
@@ -362,7 +359,7 @@ const AccordionImpl = React.forwardRef<AccordionImplElement, AccordionImplProps>
         direction={dir}
         orientation={orientation}
       >
-        <Collection.Slot scope={__scopeAccordion}>
+        <Collection.Slot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}>
           <YStack
             data-orientation={orientation}
             ref={composedRef}
@@ -384,8 +381,8 @@ const AccordionImpl = React.forwardRef<AccordionImplElement, AccordionImplProps>
 const ITEM_NAME = 'AccordionItem'
 
 type AccordionItemContextValue = { open?: boolean; disabled?: boolean; triggerId: string }
-const [AccordionItemProvider, useAccordionItemContext] =
-  createAccordionContext<AccordionItemContextValue>(ITEM_NAME)
+const { Provider: AccordionItemProvider, useStyledContext: useAccordionItemContext } =
+  createStyledContext<AccordionItemContextValue>()
 type AccordionItemElement = React.ElementRef<typeof Collapsible>
 type CollapsibleProps = React.ComponentPropsWithoutRef<typeof Collapsible>
 interface AccordionItemProps
@@ -409,9 +406,8 @@ interface AccordionItemProps
 const AccordionItem = React.forwardRef<AccordionItemElement, AccordionItemProps>(
   (props: ScopedProps<AccordionItemProps>, forwardedRef) => {
     const { __scopeAccordion, value, ...accordionItemProps } = props
-    const accordionContext = useAccordionContext(ITEM_NAME, __scopeAccordion)
-    const valueContext = useAccordionValueContext(ITEM_NAME, __scopeAccordion)
-    const collapsibleScope = useCollapsibleScope(__scopeAccordion)
+    const accordionContext = useAccordionContext(__scopeAccordion)
+    const valueContext = useAccordionValueContext(__scopeAccordion)
     const triggerId = React.useId()
     const open = (value && valueContext.value.includes(value)) || false
     const disabled = accordionContext.disabled || props.disabled
@@ -426,7 +422,7 @@ const AccordionItem = React.forwardRef<AccordionItemElement, AccordionItemProps>
         <Collapsible
           data-orientation={accordionContext.orientation}
           data-state={open ? 'open' : 'closed'}
-          {...collapsibleScope}
+          __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
           {...accordionItemProps}
           ref={forwardedRef}
           disabled={disabled}
@@ -463,8 +459,8 @@ type AccordionHeaderProps = PrimitiveHeading3Props
 const AccordionHeader = React.forwardRef<AccordionHeaderElement, AccordionHeaderProps>(
   (props: ScopedProps<AccordionHeaderProps>, forwardedRef) => {
     const { __scopeAccordion, ...headerProps } = props
-    const accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion)
-    const itemContext = useAccordionItemContext(HEADER_NAME, __scopeAccordion)
+    const accordionContext = useAccordionContext(__scopeAccordion)
+    const itemContext = useAccordionItemContext(__scopeAccordion)
     return (
       <H1
         data-orientation={accordionContext.orientation}
@@ -513,8 +509,6 @@ const AccordionTriggerFrame = styled(Collapsible.Trigger, {
   },
 })
 
-const TRIGGER_NAME = 'AccordionTrigger'
-
 type AccordionTrigger = GetRef<typeof AccordionTriggerFrame>
 type AccordionTriggerProps = GetProps<typeof AccordionTriggerFrame>
 
@@ -527,21 +521,18 @@ const AccordionTrigger = AccordionTriggerFrame.styleable(function AccordionTrigg
   forwardedRef
 ) {
   const { __scopeAccordion, ...triggerProps } = props
-  const accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion)
-  const itemContext = useAccordionItemContext(TRIGGER_NAME, __scopeAccordion)
-  const collapsibleContext = useAccordionCollapsibleContext(
-    TRIGGER_NAME,
-    __scopeAccordion
-  )
-  const collapsibleScope = useCollapsibleScope(__scopeAccordion)
+  const accordionContext = useAccordionContext(__scopeAccordion)
+  const itemContext = useAccordionItemContext(__scopeAccordion)
+  const collapsibleContext = useAccordionCollapsibleContext(__scopeAccordion)
 
   return (
-    <Collection.ItemSlot scope={__scopeAccordion}>
+    <Collection.ItemSlot __scopeCollection={__scopeAccordion || ACCORDION_CONTEXT}>
       <AccordionTriggerFrame
+        //   @ts-ignore
+        __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
         aria-disabled={(itemContext.open && !collapsibleContext.collapsible) || undefined}
         data-orientation={accordionContext.orientation}
         id={itemContext.triggerId}
-        {...collapsibleScope}
         {...triggerProps}
         ref={forwardedRef}
       />
@@ -578,15 +569,14 @@ const AccordionContent = AccordionContentFrame.styleable(function AccordionConte
   forwardedRef
 ) {
   const { __scopeAccordion, ...contentProps } = props
-  const accordionContext = useAccordionContext(ACCORDION_NAME, __scopeAccordion)
-  const itemContext = useAccordionItemContext('AccordionContent', __scopeAccordion)
-  const collapsibleScope = useCollapsibleScope(__scopeAccordion)
+  const accordionContext = useAccordionContext(__scopeAccordion)
+  const itemContext = useAccordionItemContext(__scopeAccordion)
   return (
     <AccordionContentFrame
       role="region"
       aria-labelledby={itemContext.triggerId}
       data-orientation={accordionContext.orientation}
-      {...collapsibleScope}
+      __scopeCollapsible={__scopeAccordion || ACCORDION_CONTEXT}
       {...contentProps}
       ref={forwardedRef}
     />
@@ -605,7 +595,7 @@ const Accordion = withStaticProperties(AccordionComponent, {
   Item: AccordionItem,
 })
 
-export { Accordion, createAccordionScope }
+export { Accordion }
 
 export type {
   AccordionContentProps,