@react-aria/collections 3.0.0-nightly.5042 → 3.0.0-rc.0

package/dist/CollectionBuilder.main.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/collections/src/CollectionBuilder.tsx"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {BaseCollection} from './BaseCollection';\nimport {BaseNode, Document, ElementNode} from './Document';\nimport {CachedChildrenOptions, useCachedChildren} from './useCachedChildren';\nimport {createPortal} from 'react-dom';\nimport {forwardRefType, Node} from '@react-types/shared';\nimport {Hidden} from './Hidden';\nimport React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';\nimport {useIsSSR} from '@react-aria/ssr';\nimport {useLayoutEffect} from '@react-aria/utils';\nimport {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js';\n\nconst ShallowRenderContext = createContext(false);\nconst CollectionDocumentContext = createContext<Document<any, BaseCollection<any>> | null>(null);\n\nexport interface CollectionBuilderProps<C extends BaseCollection<object>> {\n  content: ReactNode,\n  children: (collection: C) => ReactNode,\n  createCollection?: () => C\n}\n\n/**\n * Builds a `Collection` from the children provided to the `content` prop, and passes it to the child render prop function.\n */\nexport function CollectionBuilder<C extends BaseCollection<object>>(props: CollectionBuilderProps<C>): ReactElement {\n  // If a document was provided above us, we're already in a hidden tree. Just render the content.\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    // The React types prior to 18 did not allow returning ReactNode from components\n    // even though the actual implementation since React 16 did.\n    // We must return ReactElement so that TS does not complain that <CollectionBuilder>\n    // is not a valid JSX element with React 16 and 17 types.\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20544\n    return props.content as ReactElement;\n  }\n\n  // Otherwise, render a hidden copy of the children so that we can build the collection before constructing the state.\n  // This should always come before the real DOM content so we have built the collection by the time it renders during SSR.\n\n  // This is fine. CollectionDocumentContext never changes after mounting.\n  // eslint-disable-next-line react-hooks/rules-of-hooks\n  let {collection, document} = useCollectionDocument(props.createCollection);\n  return (\n    <>\n      <Hidden>\n        <CollectionDocumentContext.Provider value={document}>\n          {props.content}\n        </CollectionDocumentContext.Provider>\n      </Hidden>\n      <CollectionInner render={props.children} collection={collection} />\n    </>\n  );\n}\n\nfunction CollectionInner({collection, render}) {\n  return render(collection);\n}\n\ninterface CollectionDocumentResult<T, C extends BaseCollection<T>> {\n  collection: C,\n  document: Document<T, C>\n}\n\n// React 16 and 17 don't support useSyncExternalStore natively, and the shim provided by React does not support getServerSnapshot.\n// This wrapper uses the shim, but additionally calls getServerSnapshot during SSR (according to SSRProvider).\nfunction useSyncExternalStoreFallback<C>(subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => C, getServerSnapshot: () => C): C {\n  let isSSR = useIsSSR();\n  let isSSRRef = useRef(isSSR);\n  // This is read immediately inside the wrapper, which also runs during render.\n  // We just need a ref to avoid invalidating the callback itself, which\n  // would cause React to re-run the callback more than necessary.\n  // eslint-disable-next-line rulesdir/pure-render\n  isSSRRef.current = isSSR;\n\n  let getSnapshotWrapper = useCallback(() => {\n    return isSSRRef.current ? getServerSnapshot() : getSnapshot();\n  }, [getSnapshot, getServerSnapshot]);\n  return useSyncExternalStoreShim(subscribe, getSnapshotWrapper);\n}\n\nconst useSyncExternalStore = typeof React['useSyncExternalStore'] === 'function'\n  ? React['useSyncExternalStore']\n  : useSyncExternalStoreFallback;\n\nfunction useCollectionDocument<T extends object, C extends BaseCollection<T>>(createCollection?: () => C): CollectionDocumentResult<T, C> {\n  // The document instance is mutable, and should never change between renders.\n  // useSyncExternalStore is used to subscribe to updates, which vends immutable Collection objects.\n  let [document] = useState(() => new Document<T, C>(createCollection?.() || new BaseCollection() as C));\n  let subscribe = useCallback((fn: () => void) => document.subscribe(fn), [document]);\n  let getSnapshot = useCallback(() => {\n    let collection = document.getCollection();\n    if (document.isSSR) {\n      // After SSR is complete, reset the document to empty so it is ready for React to render the portal into.\n      // We do this _after_ getting the collection above so that the collection still has content in it from SSR\n      // during the current render, before React has finished the client render.\n      document.resetAfterSSR();\n    }\n    return collection;\n  }, [document]);\n  let getServerSnapshot = useCallback(() => {\n    document.isSSR = true;\n    return document.getCollection();\n  }, [document]);\n  let collection = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);\n  useLayoutEffect(() => {\n    document.isMounted = true;\n    return () => {\n      // Mark unmounted so we can skip all of the collection updates caused by \n      // React calling removeChild on every item in the collection.\n      document.isMounted = false;\n    };\n  }, [document]);\n  return {collection, document};\n}\n\nconst SSRContext = createContext<BaseNode<any> | null>(null);\n\nfunction useSSRCollectionNode<T extends Element>(Type: string, props: object, ref: ForwardedRef<T>, rendered?: any, children?: ReactNode, render?: (node: Node<T>) => ReactElement) {\n  // During SSR, portals are not supported, so the collection children will be wrapped in an SSRContext.\n  // Since SSR occurs only once, we assume that the elements are rendered in order and never re-render.\n  // Therefore we can create elements in our collection document during render so that they are in the\n  // collection by the time we need to use the collection to render to the real DOM.\n  // After hydration, we switch to client rendering using the portal.\n  let itemRef = useCallback((element: ElementNode<any> | null) => {\n    element?.setProps(props, ref, rendered, render);\n  }, [props, ref, rendered, render]);\n  let parentNode = useContext(SSRContext);\n  if (parentNode) {\n    // Guard against double rendering in strict mode.\n    let element = parentNode.ownerDocument.nodesByProps.get(props);\n    if (!element) {\n      element = parentNode.ownerDocument.createElement(Type);\n      element.setProps(props, ref, rendered, render);\n      parentNode.appendChild(element);\n      parentNode.ownerDocument.updateCollection();\n      parentNode.ownerDocument.nodesByProps.set(props, element);\n    }\n\n    return children\n      ? <SSRContext.Provider value={element}>{children}</SSRContext.Provider>\n      : null;\n  }\n\n  // @ts-ignore\n  return <Type ref={itemRef}>{children}</Type>;\n}\n\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactElement | null;\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactElement | null;\nexport function createLeafComponent<P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node?: any) => ReactElement) {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let isShallow = useContext(ShallowRenderContext);\n    if (!isShallow) {\n      if (render.length >= 3) {\n        throw new Error(render.name + ' cannot be rendered outside a collection.');\n      }\n      return render(props, ref);\n    }\n\n    return useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, node => <Component node={node} />);\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nexport function createBranchComponent<T extends object, P extends {children?: any}, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement, useChildren: (props: P) => ReactNode = useCollectionChildren) {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let children = useChildren(props);\n    return useSSRCollectionNode(type, props, ref, null, children, node => <Component node={node} />) ?? <></>;\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nfunction useCollectionChildren<T extends object>(options: CachedChildrenOptions<T>) {\n  return useCachedChildren({...options, addIdAndValue: true});\n}\n\nexport interface CollectionProps<T> extends CachedChildrenOptions<T> {}\n\nconst CollectionContext = createContext<CachedChildrenOptions<unknown> | null>(null);\n\n/** A Collection renders a list of items, automatically managing caching and keys. */\nexport function Collection<T extends object>(props: CollectionProps<T>): JSX.Element {\n  let ctx = useContext(CollectionContext)!;\n  let dependencies = (ctx?.dependencies || []).concat(props.dependencies);\n  let idScope = props.idScope || ctx?.idScope;\n  let children = useCollectionChildren({\n    ...props,\n    idScope,\n    dependencies\n  });\n\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    children = <CollectionRoot>{children}</CollectionRoot>;\n  }\n\n  // Propagate dependencies and idScope to child collections.\n  ctx = useMemo(() => ({\n    dependencies,\n    idScope\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  }), [idScope, ...dependencies]);\n\n  return (\n    <CollectionContext.Provider value={ctx}>\n      {children}\n    </CollectionContext.Provider>\n  );\n}\n\nfunction CollectionRoot({children}) {\n  let doc = useContext(CollectionDocumentContext);\n  let wrappedChildren = useMemo(() => (\n    <CollectionDocumentContext.Provider value={null}>\n      <ShallowRenderContext.Provider value>\n        {children}\n      </ShallowRenderContext.Provider>\n    </CollectionDocumentContext.Provider>\n  ), [children]);\n  // During SSR, we render the content directly, and append nodes to the document during render.\n  // The collection children return null so that nothing is actually rendered into the HTML.\n  return useIsSSR()\n    ? <SSRContext.Provider value={doc}>{wrappedChildren}</SSRContext.Provider>\n    : createPortal(wrappedChildren, doc as unknown as Element);\n}\n"],"names":[],"version":3,"file":"CollectionBuilder.main.js.map"}
+{"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;;;;;AAcD,MAAM,2DAAuB,CAAA,GAAA,0BAAY,EAAE;AAC3C,MAAM,gEAA4B,CAAA,GAAA,0BAAY,EAA6C;AAWpF,SAAS,0CAAoD,KAAgC;IAClG,gGAAgG;IAChG,IAAI,MAAM,CAAA,GAAA,uBAAS,EAAE;IACrB,IAAI,KACF,gFAAgF;IAChF,4DAA4D;IAC5D,oFAAoF;IACpF,yDAAyD;IACzD,kEAAkE;IAClE,OAAO,MAAM,OAAO;IAGtB,qHAAqH;IACrH,yHAAyH;IAEzH,wEAAwE;IACxE,sDAAsD;IACtD,IAAI,cAAC,UAAU,YAAE,QAAQ,EAAC,GAAG,4CAAsB,MAAM,gBAAgB;IACzE,qBACE,oIACE,0DAAC,CAAA,GAAA,gCAAK,uBACJ,0DAAC,gDAA0B,QAAQ;QAAC,OAAO;OACxC,MAAM,OAAO,kBAGlB,0DAAC;QAAgB,QAAQ,MAAM,QAAQ;QAAE,YAAY;;AAG3D;AAEA,SAAS,sCAAgB,cAAC,UAAU,UAAE,MAAM,EAAC;IAC3C,OAAO,OAAO;AAChB;AAOA,kIAAkI;AAClI,8GAA8G;AAC9G,SAAS,mDAAgC,SAAoD,EAAE,WAAoB,EAAE,iBAA0B;IAC7I,IAAI,QAAQ,CAAA,GAAA,4BAAO;IACnB,IAAI,WAAW,CAAA,GAAA,mBAAK,EAAE;IACtB,8EAA8E;IAC9E,sEAAsE;IACtE,gEAAgE;IAChE,gDAAgD;IAChD,SAAS,OAAO,GAAG;IAEnB,IAAI,qBAAqB,CAAA,GAAA,wBAAU,EAAE;QACnC,OAAO,SAAS,OAAO,GAAG,sBAAsB;IAClD,GAAG;QAAC;QAAa;KAAkB;IACnC,OAAO,CAAA,GAAA,2DAAuB,EAAE,WAAW;AAC7C;AAEA,MAAM,6CAAuB,OAAO,CAAA,GAAA,sCAAI,CAAC,CAAC,uBAAuB,KAAK,aAClE,CAAA,GAAA,sCAAI,CAAC,CAAC,uBAAuB,GAC7B;AAEJ,SAAS,4CAAqE,gBAA0B;IACtG,6EAA6E;IAC7E,kGAAkG;IAClG,IAAI,CAAC,SAAS,GAAG,CAAA,GAAA,qBAAO,EAAE,IAAM,IAAI,CAAA,GAAA,kCAAO,EAAQ,CAAA,6BAAA,uCAAA,uBAAwB,IAAI,CAAA,GAAA,wCAAa;IAC5F,IAAI,YAAY,CAAA,GAAA,wBAAU,EAAE,CAAC,KAAmB,SAAS,SAAS,CAAC,KAAK;QAAC;KAAS;IAClF,IAAI,cAAc,CAAA,GAAA,wBAAU,EAAE;QAC5B,IAAI,aAAa,SAAS,aAAa;QACvC,IAAI,SAAS,KAAK,EAChB,yGAAyG;QACzG,0GAA0G;QAC1G,0EAA0E;QAC1E,SAAS,aAAa;QAExB,OAAO;IACT,GAAG;QAAC;KAAS;IACb,IAAI,oBAAoB,CAAA,GAAA,wBAAU,EAAE;QAClC,SAAS,KAAK,GAAG;QACjB,OAAO,SAAS,aAAa;IAC/B,GAAG;QAAC;KAAS;IACb,IAAI,aAAa,2CAAqB,WAAW,aAAa;IAC9D,CAAA,GAAA,qCAAc,EAAE;QACd,SAAS,SAAS,GAAG;QACrB,OAAO;YACL,wEAAwE;YACxE,6DAA6D;YAC7D,SAAS,SAAS,GAAG;QACvB;IACF,GAAG;QAAC;KAAS;IACb,OAAO;oBAAC;kBAAY;IAAQ;AAC9B;AAEA,MAAM,iDAAa,CAAA,GAAA,0BAAY,EAAwB;AAEvD,SAAS,2CAAwC,IAAY,EAAE,KAAa,EAAE,GAAoB,EAAE,QAAc,EAAE,QAAoB,EAAE,MAAwC;IAChL,sGAAsG;IACtG,qGAAqG;IACrG,oGAAoG;IACpG,kFAAkF;IAClF,mEAAmE;IACnE,IAAI,UAAU,CAAA,GAAA,wBAAU,EAAE,CAAC;QACzB,oBAAA,8BAAA,QAAS,QAAQ,CAAC,OAAO,KAAK,UAAU;IAC1C,GAAG;QAAC;QAAO;QAAK;QAAU;KAAO;IACjC,IAAI,aAAa,CAAA,GAAA,uBAAS,EAAE;IAC5B,IAAI,YAAY;QACd,iDAAiD;QACjD,IAAI,UAAU,WAAW,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC;QACxD,IAAI,CAAC,SAAS;YACZ,UAAU,WAAW,aAAa,CAAC,aAAa,CAAC;YACjD,QAAQ,QAAQ,CAAC,OAAO,KAAK,UAAU;YACvC,WAAW,WAAW,CAAC;YACvB,WAAW,aAAa,CAAC,gBAAgB;YACzC,WAAW,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO;QACnD;QAEA,OAAO,yBACH,0DAAC,iCAAW,QAAQ;YAAC,OAAO;WAAU,YACtC;IACN;IAEA,aAAa;IACb,qBAAO,0DAAC;QAAK,KAAK;OAAU;AAC9B;AAIO,SAAS,0CAAyD,IAAY,EAAE,MAAoE;IACzJ,IAAI,YAAY,CAAC,QAAC,IAAI,EAAC,GAAK,OAAO,KAAK,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,EAAE;IAC/D,IAAI,SAAS,AAAC,CAAA,GAAA,uBAAS,EAAqB,CAAC,OAAU;QACrD,IAAI,iBAAiB,CAAA,GAAA,uBAAS,EAAE,CAAA,GAAA,6CAAe;QAC/C,IAAI,YAAY,CAAA,GAAA,uBAAS,EAAE;QAC3B,IAAI,CAAC,WAAW;YACd,IAAI,OAAO,MAAM,IAAI,GACnB,MAAM,IAAI,MAAM,OAAO,IAAI,GAAG;YAEhC,OAAO,OAAO,OAAO;QACvB;QAEA,OAAO,2CACL,MACA,OACA,KACA,cAAc,QAAQ,MAAM,QAAQ,GAAG,MACvC,MACA,CAAA,OACE,8DAA8D;0BAC9D,0DAAC,CAAA,GAAA,6CAAe,EAAE,QAAQ;gBAAC,OAAO;6BAChC,0DAAC;gBAAU,MAAM;;IAIzB;IACA,aAAa;IACb,OAAO,WAAW,GAAG,OAAO,IAAI;IAChC,OAAO;AACT;AAEO,SAAS,0CAAuF,IAAY,EAAE,MAAuE,EAAE,cAAuC,2CAAqB;IACxP,IAAI,YAAY,CAAC,QAAC,IAAI,EAAC,GAAK,OAAO,KAAK,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,EAAE;IAC/D,IAAI,SAAS,AAAC,CAAA,GAAA,uBAAS,EAAqB,CAAC,OAAU;QACrD,IAAI,WAAW,YAAY;YACpB;QAAP,OAAO,CAAA,wBAAA,2CAAqB,MAAM,OAAO,KAAK,MAAM,UAAU,CAAA,qBAAQ,0DAAC;gBAAU,MAAM;6BAAhF,mCAAA,sCAA6F;IACtG;IACA,aAAa;IACb,OAAO,WAAW,GAAG,OAAO,IAAI;IAChC,OAAO;AACT;AAEA,SAAS,4CAAwC,OAAiC;IAChF,OAAO,CAAA,GAAA,2CAAgB,EAAE;QAAC,GAAG,OAAO;QAAE,eAAe;IAAI;AAC3D;AAIA,MAAM,wDAAoB,CAAA,GAAA,0BAAY,EAAyC;AAGxE,SAAS,0CAA6B,KAAyB;IACpE,IAAI,MAAM,CAAA,GAAA,uBAAS,EAAE;IACrB,IAAI,eAAe,AAAC,CAAA,CAAA,gBAAA,0BAAA,IAAK,YAAY,KAAI,EAAE,AAAD,EAAG,MAAM,CAAC,MAAM,YAAY;IACtE,IAAI,UAAU,MAAM,OAAO,KAAI,gBAAA,0BAAA,IAAK,OAAO;IAC3C,IAAI,WAAW,4CAAsB;QACnC,GAAG,KAAK;iBACR;sBACA;IACF;IAEA,IAAI,MAAM,CAAA,GAAA,uBAAS,EAAE;IACrB,IAAI,KACF,yBAAW,0DAAC,4CAAgB;IAG9B,2DAA2D;IAC3D,MAAM,CAAA,GAAA,oBAAM,EAAE,IAAO,CAAA;0BACnB;qBACA;QAEF,CAAA,GAAI;QAAC;WAAY;KAAa;IAE9B,qBACE,0DAAC,wCAAkB,QAAQ;QAAC,OAAO;OAChC;AAGP;AAEA,SAAS,qCAAe,YAAC,QAAQ,EAAC;IAChC,IAAI,MAAM,CAAA,GAAA,uBAAS,EAAE;IACrB,IAAI,kBAAkB,CAAA,GAAA,oBAAM,EAAE,kBAC5B,0DAAC,gDAA0B,QAAQ;YAAC,OAAO;yBACzC,0DAAC,2CAAqB,QAAQ;YAAC,OAAA;WAC5B,YAGJ;QAAC;KAAS;IACb,8FAA8F;IAC9F,0FAA0F;IAC1F,OAAO,CAAA,GAAA,4BAAO,oBACV,0DAAC,iCAAW,QAAQ;QAAC,OAAO;OAAM,iCAClC,CAAA,GAAA,4BAAW,EAAE,iBAAiB;AACpC","sources":["packages/@react-aria/collections/src/CollectionBuilder.tsx"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {BaseCollection} from './BaseCollection';\nimport {BaseNode, Document, ElementNode} from './Document';\nimport {CachedChildrenOptions, useCachedChildren} from './useCachedChildren';\nimport {createPortal} from 'react-dom';\nimport {FocusableContext} from '@react-aria/interactions';\nimport {forwardRefType, Node} from '@react-types/shared';\nimport {Hidden} from './Hidden';\nimport React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';\nimport {useIsSSR} from '@react-aria/ssr';\nimport {useLayoutEffect} from '@react-aria/utils';\nimport {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js';\n\nconst ShallowRenderContext = createContext(false);\nconst CollectionDocumentContext = createContext<Document<any, BaseCollection<any>> | null>(null);\n\nexport interface CollectionBuilderProps<C extends BaseCollection<object>> {\n  content: ReactNode,\n  children: (collection: C) => ReactNode,\n  createCollection?: () => C\n}\n\n/**\n * Builds a `Collection` from the children provided to the `content` prop, and passes it to the child render prop function.\n */\nexport function CollectionBuilder<C extends BaseCollection<object>>(props: CollectionBuilderProps<C>): ReactElement {\n  // If a document was provided above us, we're already in a hidden tree. Just render the content.\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    // The React types prior to 18 did not allow returning ReactNode from components\n    // even though the actual implementation since React 16 did.\n    // We must return ReactElement so that TS does not complain that <CollectionBuilder>\n    // is not a valid JSX element with React 16 and 17 types.\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20544\n    return props.content as ReactElement;\n  }\n\n  // Otherwise, render a hidden copy of the children so that we can build the collection before constructing the state.\n  // This should always come before the real DOM content so we have built the collection by the time it renders during SSR.\n\n  // This is fine. CollectionDocumentContext never changes after mounting.\n  // eslint-disable-next-line react-hooks/rules-of-hooks\n  let {collection, document} = useCollectionDocument(props.createCollection);\n  return (\n    <>\n      <Hidden>\n        <CollectionDocumentContext.Provider value={document}>\n          {props.content}\n        </CollectionDocumentContext.Provider>\n      </Hidden>\n      <CollectionInner render={props.children} collection={collection} />\n    </>\n  );\n}\n\nfunction CollectionInner({collection, render}) {\n  return render(collection);\n}\n\ninterface CollectionDocumentResult<T, C extends BaseCollection<T>> {\n  collection: C,\n  document: Document<T, C>\n}\n\n// React 16 and 17 don't support useSyncExternalStore natively, and the shim provided by React does not support getServerSnapshot.\n// This wrapper uses the shim, but additionally calls getServerSnapshot during SSR (according to SSRProvider).\nfunction useSyncExternalStoreFallback<C>(subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => C, getServerSnapshot: () => C): C {\n  let isSSR = useIsSSR();\n  let isSSRRef = useRef(isSSR);\n  // This is read immediately inside the wrapper, which also runs during render.\n  // We just need a ref to avoid invalidating the callback itself, which\n  // would cause React to re-run the callback more than necessary.\n  // eslint-disable-next-line rulesdir/pure-render\n  isSSRRef.current = isSSR;\n\n  let getSnapshotWrapper = useCallback(() => {\n    return isSSRRef.current ? getServerSnapshot() : getSnapshot();\n  }, [getSnapshot, getServerSnapshot]);\n  return useSyncExternalStoreShim(subscribe, getSnapshotWrapper);\n}\n\nconst useSyncExternalStore = typeof React['useSyncExternalStore'] === 'function'\n  ? React['useSyncExternalStore']\n  : useSyncExternalStoreFallback;\n\nfunction useCollectionDocument<T extends object, C extends BaseCollection<T>>(createCollection?: () => C): CollectionDocumentResult<T, C> {\n  // The document instance is mutable, and should never change between renders.\n  // useSyncExternalStore is used to subscribe to updates, which vends immutable Collection objects.\n  let [document] = useState(() => new Document<T, C>(createCollection?.() || new BaseCollection() as C));\n  let subscribe = useCallback((fn: () => void) => document.subscribe(fn), [document]);\n  let getSnapshot = useCallback(() => {\n    let collection = document.getCollection();\n    if (document.isSSR) {\n      // After SSR is complete, reset the document to empty so it is ready for React to render the portal into.\n      // We do this _after_ getting the collection above so that the collection still has content in it from SSR\n      // during the current render, before React has finished the client render.\n      document.resetAfterSSR();\n    }\n    return collection;\n  }, [document]);\n  let getServerSnapshot = useCallback(() => {\n    document.isSSR = true;\n    return document.getCollection();\n  }, [document]);\n  let collection = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);\n  useLayoutEffect(() => {\n    document.isMounted = true;\n    return () => {\n      // Mark unmounted so we can skip all of the collection updates caused by\n      // React calling removeChild on every item in the collection.\n      document.isMounted = false;\n    };\n  }, [document]);\n  return {collection, document};\n}\n\nconst SSRContext = createContext<BaseNode<any> | null>(null);\n\nfunction useSSRCollectionNode<T extends Element>(Type: string, props: object, ref: ForwardedRef<T>, rendered?: any, children?: ReactNode, render?: (node: Node<T>) => ReactElement) {\n  // During SSR, portals are not supported, so the collection children will be wrapped in an SSRContext.\n  // Since SSR occurs only once, we assume that the elements are rendered in order and never re-render.\n  // Therefore we can create elements in our collection document during render so that they are in the\n  // collection by the time we need to use the collection to render to the real DOM.\n  // After hydration, we switch to client rendering using the portal.\n  let itemRef = useCallback((element: ElementNode<any> | null) => {\n    element?.setProps(props, ref, rendered, render);\n  }, [props, ref, rendered, render]);\n  let parentNode = useContext(SSRContext);\n  if (parentNode) {\n    // Guard against double rendering in strict mode.\n    let element = parentNode.ownerDocument.nodesByProps.get(props);\n    if (!element) {\n      element = parentNode.ownerDocument.createElement(Type);\n      element.setProps(props, ref, rendered, render);\n      parentNode.appendChild(element);\n      parentNode.ownerDocument.updateCollection();\n      parentNode.ownerDocument.nodesByProps.set(props, element);\n    }\n\n    return children\n      ? <SSRContext.Provider value={element}>{children}</SSRContext.Provider>\n      : null;\n  }\n\n  // @ts-ignore\n  return <Type ref={itemRef}>{children}</Type>;\n}\n\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactNode;\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactNode;\nexport function createLeafComponent<P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node?: any) => ReactElement): (props: P & React.RefAttributes<any>) => ReactNode {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let focusableProps = useContext(FocusableContext);\n    let isShallow = useContext(ShallowRenderContext);\n    if (!isShallow) {\n      if (render.length >= 3) {\n        throw new Error(render.name + ' cannot be rendered outside a collection.');\n      }\n      return render(props, ref);\n    }\n\n    return useSSRCollectionNode(\n      type,\n      props,\n      ref,\n      'children' in props ? props.children : null,\n      null,\n      node => (\n        // Forward FocusableContext to real DOM tree so tooltips work.\n        <FocusableContext.Provider value={focusableProps}>\n          <Component node={node} />\n        </FocusableContext.Provider>\n      )\n    );\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nexport function createBranchComponent<T extends object, P extends {children?: any}, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement, useChildren: (props: P) => ReactNode = useCollectionChildren): (props: P & React.RefAttributes<E>) => ReactNode {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let children = useChildren(props);\n    return useSSRCollectionNode(type, props, ref, null, children, node => <Component node={node} />) ?? <></>;\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nfunction useCollectionChildren<T extends object>(options: CachedChildrenOptions<T>) {\n  return useCachedChildren({...options, addIdAndValue: true});\n}\n\nexport interface CollectionProps<T> extends CachedChildrenOptions<T> {}\n\nconst CollectionContext = createContext<CachedChildrenOptions<unknown> | null>(null);\n\n/** A Collection renders a list of items, automatically managing caching and keys. */\nexport function Collection<T extends object>(props: CollectionProps<T>): JSX.Element {\n  let ctx = useContext(CollectionContext)!;\n  let dependencies = (ctx?.dependencies || []).concat(props.dependencies);\n  let idScope = props.idScope || ctx?.idScope;\n  let children = useCollectionChildren({\n    ...props,\n    idScope,\n    dependencies\n  });\n\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    children = <CollectionRoot>{children}</CollectionRoot>;\n  }\n\n  // Propagate dependencies and idScope to child collections.\n  ctx = useMemo(() => ({\n    dependencies,\n    idScope\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  }), [idScope, ...dependencies]);\n\n  return (\n    <CollectionContext.Provider value={ctx}>\n      {children}\n    </CollectionContext.Provider>\n  );\n}\n\nfunction CollectionRoot({children}) {\n  let doc = useContext(CollectionDocumentContext);\n  let wrappedChildren = useMemo(() => (\n    <CollectionDocumentContext.Provider value={null}>\n      <ShallowRenderContext.Provider value>\n        {children}\n      </ShallowRenderContext.Provider>\n    </CollectionDocumentContext.Provider>\n  ), [children]);\n  // During SSR, we render the content directly, and append nodes to the document during render.\n  // The collection children return null so that nothing is actually rendered into the HTML.\n  return useIsSSR()\n    ? <SSRContext.Provider value={doc}>{wrappedChildren}</SSRContext.Provider>\n    : createPortal(wrappedChildren, doc as unknown as Element);\n}\n"],"names":[],"version":3,"file":"CollectionBuilder.main.js.map"}

package/dist/CollectionBuilder.mjs

@@ -3,6 +3,7 @@ import {Document as $681cc3c98f569e39$export$b34a105447964f9f} from "./Document.
 import {useCachedChildren as $e948873055cbafe4$export$727c8fc270210f13} from "./useCachedChildren.mjs";
 import {Hidden as $f39a9eba43920ace$export$8dc98ba7eadeaa56} from "./Hidden.mjs";
 import {createPortal as $95feo$createPortal} from "react-dom";
+import {FocusableContext as $95feo$FocusableContext} from "@react-aria/interactions";
 import $95feo$react, {createContext as $95feo$createContext, useContext as $95feo$useContext, useRef as $95feo$useRef, useCallback as $95feo$useCallback, useState as $95feo$useState, forwardRef as $95feo$forwardRef, useMemo as $95feo$useMemo} from "react";
 import {useIsSSR as $95feo$useIsSSR} from "@react-aria/ssr";
 import {useLayoutEffect as $95feo$useLayoutEffect} from "@react-aria/utils";
@@ -27,6 +28,7 @@ import {useSyncExternalStore as $95feo$useSyncExternalStore} from "use-sync-exte
 
 
 
+
 const $e1995378a142960e$var$ShallowRenderContext = /*#__PURE__*/ (0, $95feo$createContext)(false);
 const $e1995378a142960e$var$CollectionDocumentContext = /*#__PURE__*/ (0, $95feo$createContext)(null);
 function $e1995378a142960e$export$bf788dd355e3a401(props) {
@@ -99,7 +101,7 @@ function $e1995378a142960e$var$useCollectionDocument(createCollection) {
     (0, $95feo$useLayoutEffect)(()=>{
         document.isMounted = true;
         return ()=>{
-            // Mark unmounted so we can skip all of the collection updates caused by 
+            // Mark unmounted so we can skip all of the collection updates caused by
             // React calling removeChild on every item in the collection.
             document.isMounted = false;
         };
@@ -149,14 +151,18 @@ function $e1995378a142960e$var$useSSRCollectionNode(Type, props, ref, rendered,
 function $e1995378a142960e$export$18af5c7a9e9b3664(type, render) {
     let Component = ({ node: node })=>render(node.props, node.props.ref, node);
     let Result = (0, $95feo$forwardRef)((props, ref)=>{
+        let focusableProps = (0, $95feo$useContext)((0, $95feo$FocusableContext));
         let isShallow = (0, $95feo$useContext)($e1995378a142960e$var$ShallowRenderContext);
         if (!isShallow) {
             if (render.length >= 3) throw new Error(render.name + ' cannot be rendered outside a collection.');
             return render(props, ref);
         }
-        return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>/*#__PURE__*/ (0, $95feo$react).createElement(Component, {
+        return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>// Forward FocusableContext to real DOM tree so tooltips work.
+            /*#__PURE__*/ (0, $95feo$react).createElement((0, $95feo$FocusableContext).Provider, {
+                value: focusableProps
+            }, /*#__PURE__*/ (0, $95feo$react).createElement(Component, {
                 node: node
-            }));
+            })));
     });
     // @ts-ignore
     Result.displayName = render.name;

package/dist/CollectionBuilder.module.js

@@ -3,6 +3,7 @@ import {Document as $681cc3c98f569e39$export$b34a105447964f9f} from "./Document.
 import {useCachedChildren as $e948873055cbafe4$export$727c8fc270210f13} from "./useCachedChildren.module.js";
 import {Hidden as $f39a9eba43920ace$export$8dc98ba7eadeaa56} from "./Hidden.module.js";
 import {createPortal as $95feo$createPortal} from "react-dom";
+import {FocusableContext as $95feo$FocusableContext} from "@react-aria/interactions";
 import $95feo$react, {createContext as $95feo$createContext, useContext as $95feo$useContext, useRef as $95feo$useRef, useCallback as $95feo$useCallback, useState as $95feo$useState, forwardRef as $95feo$forwardRef, useMemo as $95feo$useMemo} from "react";
 import {useIsSSR as $95feo$useIsSSR} from "@react-aria/ssr";
 import {useLayoutEffect as $95feo$useLayoutEffect} from "@react-aria/utils";
@@ -27,6 +28,7 @@ import {useSyncExternalStore as $95feo$useSyncExternalStore} from "use-sync-exte
 
 
 
+
 const $e1995378a142960e$var$ShallowRenderContext = /*#__PURE__*/ (0, $95feo$createContext)(false);
 const $e1995378a142960e$var$CollectionDocumentContext = /*#__PURE__*/ (0, $95feo$createContext)(null);
 function $e1995378a142960e$export$bf788dd355e3a401(props) {
@@ -99,7 +101,7 @@ function $e1995378a142960e$var$useCollectionDocument(createCollection) {
     (0, $95feo$useLayoutEffect)(()=>{
         document.isMounted = true;
         return ()=>{
-            // Mark unmounted so we can skip all of the collection updates caused by 
+            // Mark unmounted so we can skip all of the collection updates caused by
             // React calling removeChild on every item in the collection.
             document.isMounted = false;
         };
@@ -149,14 +151,18 @@ function $e1995378a142960e$var$useSSRCollectionNode(Type, props, ref, rendered,
 function $e1995378a142960e$export$18af5c7a9e9b3664(type, render) {
     let Component = ({ node: node })=>render(node.props, node.props.ref, node);
     let Result = (0, $95feo$forwardRef)((props, ref)=>{
+        let focusableProps = (0, $95feo$useContext)((0, $95feo$FocusableContext));
         let isShallow = (0, $95feo$useContext)($e1995378a142960e$var$ShallowRenderContext);
         if (!isShallow) {
             if (render.length >= 3) throw new Error(render.name + ' cannot be rendered outside a collection.');
             return render(props, ref);
         }
-        return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>/*#__PURE__*/ (0, $95feo$react).createElement(Component, {
+        return $e1995378a142960e$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>// Forward FocusableContext to real DOM tree so tooltips work.
+            /*#__PURE__*/ (0, $95feo$react).createElement((0, $95feo$FocusableContext).Provider, {
+                value: focusableProps
+            }, /*#__PURE__*/ (0, $95feo$react).createElement(Component, {
                 node: node
-            }));
+            })));
     });
     // @ts-ignore
     Result.displayName = render.name;

package/dist/CollectionBuilder.module.js.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;AAAA;;;;;;;;;;CAUC;;;;;;;;;AAaD,MAAM,2DAAuB,CAAA,GAAA,oBAAY,EAAE;AAC3C,MAAM,gEAA4B,CAAA,GAAA,oBAAY,EAA6C;AAWpF,SAAS,0CAAoD,KAAgC;IAClG,gGAAgG;IAChG,IAAI,MAAM,CAAA,GAAA,iBAAS,EAAE;IACrB,IAAI,KACF,gFAAgF;IAChF,4DAA4D;IAC5D,oFAAoF;IACpF,yDAAyD;IACzD,kEAAkE;IAClE,OAAO,MAAM,OAAO;IAGtB,qHAAqH;IACrH,yHAAyH;IAEzH,wEAAwE;IACxE,sDAAsD;IACtD,IAAI,cAAC,UAAU,YAAE,QAAQ,EAAC,GAAG,4CAAsB,MAAM,gBAAgB;IACzE,qBACE,gFACE,gCAAC,CAAA,GAAA,yCAAK,uBACJ,gCAAC,gDAA0B,QAAQ;QAAC,OAAO;OACxC,MAAM,OAAO,kBAGlB,gCAAC;QAAgB,QAAQ,MAAM,QAAQ;QAAE,YAAY;;AAG3D;AAEA,SAAS,sCAAgB,cAAC,UAAU,UAAE,MAAM,EAAC;IAC3C,OAAO,OAAO;AAChB;AAOA,kIAAkI;AAClI,8GAA8G;AAC9G,SAAS,mDAAgC,SAAoD,EAAE,WAAoB,EAAE,iBAA0B;IAC7I,IAAI,QAAQ,CAAA,GAAA,eAAO;IACnB,IAAI,WAAW,CAAA,GAAA,aAAK,EAAE;IACtB,8EAA8E;IAC9E,sEAAsE;IACtE,gEAAgE;IAChE,gDAAgD;IAChD,SAAS,OAAO,GAAG;IAEnB,IAAI,qBAAqB,CAAA,GAAA,kBAAU,EAAE;QACnC,OAAO,SAAS,OAAO,GAAG,sBAAsB;IAClD,GAAG;QAAC;QAAa;KAAkB;IACnC,OAAO,CAAA,GAAA,2BAAuB,EAAE,WAAW;AAC7C;AAEA,MAAM,6CAAuB,OAAO,CAAA,GAAA,YAAI,CAAC,CAAC,uBAAuB,KAAK,aAClE,CAAA,GAAA,YAAI,CAAC,CAAC,uBAAuB,GAC7B;AAEJ,SAAS,4CAAqE,gBAA0B;IACtG,6EAA6E;IAC7E,kGAAkG;IAClG,IAAI,CAAC,SAAS,GAAG,CAAA,GAAA,eAAO,EAAE,IAAM,IAAI,CAAA,GAAA,yCAAO,EAAQ,CAAA,6BAAA,uCAAA,uBAAwB,IAAI,CAAA,GAAA,yCAAa;IAC5F,IAAI,YAAY,CAAA,GAAA,kBAAU,EAAE,CAAC,KAAmB,SAAS,SAAS,CAAC,KAAK;QAAC;KAAS;IAClF,IAAI,cAAc,CAAA,GAAA,kBAAU,EAAE;QAC5B,IAAI,aAAa,SAAS,aAAa;QACvC,IAAI,SAAS,KAAK,EAChB,yGAAyG;QACzG,0GAA0G;QAC1G,0EAA0E;QAC1E,SAAS,aAAa;QAExB,OAAO;IACT,GAAG;QAAC;KAAS;IACb,IAAI,oBAAoB,CAAA,GAAA,kBAAU,EAAE;QAClC,SAAS,KAAK,GAAG;QACjB,OAAO,SAAS,aAAa;IAC/B,GAAG;QAAC;KAAS;IACb,IAAI,aAAa,2CAAqB,WAAW,aAAa;IAC9D,CAAA,GAAA,sBAAc,EAAE;QACd,SAAS,SAAS,GAAG;QACrB,OAAO;YACL,yEAAyE;YACzE,6DAA6D;YAC7D,SAAS,SAAS,GAAG;QACvB;IACF,GAAG;QAAC;KAAS;IACb,OAAO;oBAAC;kBAAY;IAAQ;AAC9B;AAEA,MAAM,iDAAa,CAAA,GAAA,oBAAY,EAAwB;AAEvD,SAAS,2CAAwC,IAAY,EAAE,KAAa,EAAE,GAAoB,EAAE,QAAc,EAAE,QAAoB,EAAE,MAAwC;IAChL,sGAAsG;IACtG,qGAAqG;IACrG,oGAAoG;IACpG,kFAAkF;IAClF,mEAAmE;IACnE,IAAI,UAAU,CAAA,GAAA,kBAAU,EAAE,CAAC;QACzB,oBAAA,8BAAA,QAAS,QAAQ,CAAC,OAAO,KAAK,UAAU;IAC1C,GAAG;QAAC;QAAO;QAAK;QAAU;KAAO;IACjC,IAAI,aAAa,CAAA,GAAA,iBAAS,EAAE;IAC5B,IAAI,YAAY;QACd,iDAAiD;QACjD,IAAI,UAAU,WAAW,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC;QACxD,IAAI,CAAC,SAAS;YACZ,UAAU,WAAW,aAAa,CAAC,aAAa,CAAC;YACjD,QAAQ,QAAQ,CAAC,OAAO,KAAK,UAAU;YACvC,WAAW,WAAW,CAAC;YACvB,WAAW,aAAa,CAAC,gBAAgB;YACzC,WAAW,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO;QACnD;QAEA,OAAO,yBACH,gCAAC,iCAAW,QAAQ;YAAC,OAAO;WAAU,YACtC;IACN;IAEA,aAAa;IACb,qBAAO,gCAAC;QAAK,KAAK;OAAU;AAC9B;AAIO,SAAS,0CAAyD,IAAY,EAAE,MAAoE;IACzJ,IAAI,YAAY,CAAC,QAAC,IAAI,EAAC,GAAK,OAAO,KAAK,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,EAAE;IAC/D,IAAI,SAAS,AAAC,CAAA,GAAA,iBAAS,EAAqB,CAAC,OAAU;QACrD,IAAI,YAAY,CAAA,GAAA,iBAAS,EAAE;QAC3B,IAAI,CAAC,WAAW;YACd,IAAI,OAAO,MAAM,IAAI,GACnB,MAAM,IAAI,MAAM,OAAO,IAAI,GAAG;YAEhC,OAAO,OAAO,OAAO;QACvB;QAEA,OAAO,2CAAqB,MAAM,OAAO,KAAK,cAAc,QAAQ,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAA,qBAAQ,gCAAC;gBAAU,MAAM;;IAC5H;IACA,aAAa;IACb,OAAO,WAAW,GAAG,OAAO,IAAI;IAChC,OAAO;AACT;AAEO,SAAS,0CAAuF,IAAY,EAAE,MAAuE,EAAE,cAAuC,2CAAqB;IACxP,IAAI,YAAY,CAAC,QAAC,IAAI,EAAC,GAAK,OAAO,KAAK,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,EAAE;IAC/D,IAAI,SAAS,AAAC,CAAA,GAAA,iBAAS,EAAqB,CAAC,OAAU;QACrD,IAAI,WAAW,YAAY;YACpB;QAAP,OAAO,CAAA,wBAAA,2CAAqB,MAAM,OAAO,KAAK,MAAM,UAAU,CAAA,qBAAQ,gCAAC;gBAAU,MAAM;6BAAhF,mCAAA,sCAA6F;IACtG;IACA,aAAa;IACb,OAAO,WAAW,GAAG,OAAO,IAAI;IAChC,OAAO;AACT;AAEA,SAAS,4CAAwC,OAAiC;IAChF,OAAO,CAAA,GAAA,yCAAgB,EAAE;QAAC,GAAG,OAAO;QAAE,eAAe;IAAI;AAC3D;AAIA,MAAM,wDAAoB,CAAA,GAAA,oBAAY,EAAyC;AAGxE,SAAS,0CAA6B,KAAyB;IACpE,IAAI,MAAM,CAAA,GAAA,iBAAS,EAAE;IACrB,IAAI,eAAe,AAAC,CAAA,CAAA,gBAAA,0BAAA,IAAK,YAAY,KAAI,EAAE,AAAD,EAAG,MAAM,CAAC,MAAM,YAAY;IACtE,IAAI,UAAU,MAAM,OAAO,KAAI,gBAAA,0BAAA,IAAK,OAAO;IAC3C,IAAI,WAAW,4CAAsB;QACnC,GAAG,KAAK;iBACR;sBACA;IACF;IAEA,IAAI,MAAM,CAAA,GAAA,iBAAS,EAAE;IACrB,IAAI,KACF,yBAAW,gCAAC,4CAAgB;IAG9B,2DAA2D;IAC3D,MAAM,CAAA,GAAA,cAAM,EAAE,IAAO,CAAA;0BACnB;qBACA;QAEF,CAAA,GAAI;QAAC;WAAY;KAAa;IAE9B,qBACE,gCAAC,wCAAkB,QAAQ;QAAC,OAAO;OAChC;AAGP;AAEA,SAAS,qCAAe,YAAC,QAAQ,EAAC;IAChC,IAAI,MAAM,CAAA,GAAA,iBAAS,EAAE;IACrB,IAAI,kBAAkB,CAAA,GAAA,cAAM,EAAE,kBAC5B,gCAAC,gDAA0B,QAAQ;YAAC,OAAO;yBACzC,gCAAC,2CAAqB,QAAQ;YAAC,OAAA;WAC5B,YAGJ;QAAC;KAAS;IACb,8FAA8F;IAC9F,0FAA0F;IAC1F,OAAO,CAAA,GAAA,eAAO,oBACV,gCAAC,iCAAW,QAAQ;QAAC,OAAO;OAAM,iCAClC,CAAA,GAAA,mBAAW,EAAE,iBAAiB;AACpC","sources":["packages/@react-aria/collections/src/CollectionBuilder.tsx"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {BaseCollection} from './BaseCollection';\nimport {BaseNode, Document, ElementNode} from './Document';\nimport {CachedChildrenOptions, useCachedChildren} from './useCachedChildren';\nimport {createPortal} from 'react-dom';\nimport {forwardRefType, Node} from '@react-types/shared';\nimport {Hidden} from './Hidden';\nimport React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';\nimport {useIsSSR} from '@react-aria/ssr';\nimport {useLayoutEffect} from '@react-aria/utils';\nimport {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js';\n\nconst ShallowRenderContext = createContext(false);\nconst CollectionDocumentContext = createContext<Document<any, BaseCollection<any>> | null>(null);\n\nexport interface CollectionBuilderProps<C extends BaseCollection<object>> {\n  content: ReactNode,\n  children: (collection: C) => ReactNode,\n  createCollection?: () => C\n}\n\n/**\n * Builds a `Collection` from the children provided to the `content` prop, and passes it to the child render prop function.\n */\nexport function CollectionBuilder<C extends BaseCollection<object>>(props: CollectionBuilderProps<C>): ReactElement {\n  // If a document was provided above us, we're already in a hidden tree. Just render the content.\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    // The React types prior to 18 did not allow returning ReactNode from components\n    // even though the actual implementation since React 16 did.\n    // We must return ReactElement so that TS does not complain that <CollectionBuilder>\n    // is not a valid JSX element with React 16 and 17 types.\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20544\n    return props.content as ReactElement;\n  }\n\n  // Otherwise, render a hidden copy of the children so that we can build the collection before constructing the state.\n  // This should always come before the real DOM content so we have built the collection by the time it renders during SSR.\n\n  // This is fine. CollectionDocumentContext never changes after mounting.\n  // eslint-disable-next-line react-hooks/rules-of-hooks\n  let {collection, document} = useCollectionDocument(props.createCollection);\n  return (\n    <>\n      <Hidden>\n        <CollectionDocumentContext.Provider value={document}>\n          {props.content}\n        </CollectionDocumentContext.Provider>\n      </Hidden>\n      <CollectionInner render={props.children} collection={collection} />\n    </>\n  );\n}\n\nfunction CollectionInner({collection, render}) {\n  return render(collection);\n}\n\ninterface CollectionDocumentResult<T, C extends BaseCollection<T>> {\n  collection: C,\n  document: Document<T, C>\n}\n\n// React 16 and 17 don't support useSyncExternalStore natively, and the shim provided by React does not support getServerSnapshot.\n// This wrapper uses the shim, but additionally calls getServerSnapshot during SSR (according to SSRProvider).\nfunction useSyncExternalStoreFallback<C>(subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => C, getServerSnapshot: () => C): C {\n  let isSSR = useIsSSR();\n  let isSSRRef = useRef(isSSR);\n  // This is read immediately inside the wrapper, which also runs during render.\n  // We just need a ref to avoid invalidating the callback itself, which\n  // would cause React to re-run the callback more than necessary.\n  // eslint-disable-next-line rulesdir/pure-render\n  isSSRRef.current = isSSR;\n\n  let getSnapshotWrapper = useCallback(() => {\n    return isSSRRef.current ? getServerSnapshot() : getSnapshot();\n  }, [getSnapshot, getServerSnapshot]);\n  return useSyncExternalStoreShim(subscribe, getSnapshotWrapper);\n}\n\nconst useSyncExternalStore = typeof React['useSyncExternalStore'] === 'function'\n  ? React['useSyncExternalStore']\n  : useSyncExternalStoreFallback;\n\nfunction useCollectionDocument<T extends object, C extends BaseCollection<T>>(createCollection?: () => C): CollectionDocumentResult<T, C> {\n  // The document instance is mutable, and should never change between renders.\n  // useSyncExternalStore is used to subscribe to updates, which vends immutable Collection objects.\n  let [document] = useState(() => new Document<T, C>(createCollection?.() || new BaseCollection() as C));\n  let subscribe = useCallback((fn: () => void) => document.subscribe(fn), [document]);\n  let getSnapshot = useCallback(() => {\n    let collection = document.getCollection();\n    if (document.isSSR) {\n      // After SSR is complete, reset the document to empty so it is ready for React to render the portal into.\n      // We do this _after_ getting the collection above so that the collection still has content in it from SSR\n      // during the current render, before React has finished the client render.\n      document.resetAfterSSR();\n    }\n    return collection;\n  }, [document]);\n  let getServerSnapshot = useCallback(() => {\n    document.isSSR = true;\n    return document.getCollection();\n  }, [document]);\n  let collection = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);\n  useLayoutEffect(() => {\n    document.isMounted = true;\n    return () => {\n      // Mark unmounted so we can skip all of the collection updates caused by \n      // React calling removeChild on every item in the collection.\n      document.isMounted = false;\n    };\n  }, [document]);\n  return {collection, document};\n}\n\nconst SSRContext = createContext<BaseNode<any> | null>(null);\n\nfunction useSSRCollectionNode<T extends Element>(Type: string, props: object, ref: ForwardedRef<T>, rendered?: any, children?: ReactNode, render?: (node: Node<T>) => ReactElement) {\n  // During SSR, portals are not supported, so the collection children will be wrapped in an SSRContext.\n  // Since SSR occurs only once, we assume that the elements are rendered in order and never re-render.\n  // Therefore we can create elements in our collection document during render so that they are in the\n  // collection by the time we need to use the collection to render to the real DOM.\n  // After hydration, we switch to client rendering using the portal.\n  let itemRef = useCallback((element: ElementNode<any> | null) => {\n    element?.setProps(props, ref, rendered, render);\n  }, [props, ref, rendered, render]);\n  let parentNode = useContext(SSRContext);\n  if (parentNode) {\n    // Guard against double rendering in strict mode.\n    let element = parentNode.ownerDocument.nodesByProps.get(props);\n    if (!element) {\n      element = parentNode.ownerDocument.createElement(Type);\n      element.setProps(props, ref, rendered, render);\n      parentNode.appendChild(element);\n      parentNode.ownerDocument.updateCollection();\n      parentNode.ownerDocument.nodesByProps.set(props, element);\n    }\n\n    return children\n      ? <SSRContext.Provider value={element}>{children}</SSRContext.Provider>\n      : null;\n  }\n\n  // @ts-ignore\n  return <Type ref={itemRef}>{children}</Type>;\n}\n\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactElement | null;\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactElement | null;\nexport function createLeafComponent<P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node?: any) => ReactElement) {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let isShallow = useContext(ShallowRenderContext);\n    if (!isShallow) {\n      if (render.length >= 3) {\n        throw new Error(render.name + ' cannot be rendered outside a collection.');\n      }\n      return render(props, ref);\n    }\n\n    return useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, node => <Component node={node} />);\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nexport function createBranchComponent<T extends object, P extends {children?: any}, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement, useChildren: (props: P) => ReactNode = useCollectionChildren) {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let children = useChildren(props);\n    return useSSRCollectionNode(type, props, ref, null, children, node => <Component node={node} />) ?? <></>;\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nfunction useCollectionChildren<T extends object>(options: CachedChildrenOptions<T>) {\n  return useCachedChildren({...options, addIdAndValue: true});\n}\n\nexport interface CollectionProps<T> extends CachedChildrenOptions<T> {}\n\nconst CollectionContext = createContext<CachedChildrenOptions<unknown> | null>(null);\n\n/** A Collection renders a list of items, automatically managing caching and keys. */\nexport function Collection<T extends object>(props: CollectionProps<T>): JSX.Element {\n  let ctx = useContext(CollectionContext)!;\n  let dependencies = (ctx?.dependencies || []).concat(props.dependencies);\n  let idScope = props.idScope || ctx?.idScope;\n  let children = useCollectionChildren({\n    ...props,\n    idScope,\n    dependencies\n  });\n\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    children = <CollectionRoot>{children}</CollectionRoot>;\n  }\n\n  // Propagate dependencies and idScope to child collections.\n  ctx = useMemo(() => ({\n    dependencies,\n    idScope\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  }), [idScope, ...dependencies]);\n\n  return (\n    <CollectionContext.Provider value={ctx}>\n      {children}\n    </CollectionContext.Provider>\n  );\n}\n\nfunction CollectionRoot({children}) {\n  let doc = useContext(CollectionDocumentContext);\n  let wrappedChildren = useMemo(() => (\n    <CollectionDocumentContext.Provider value={null}>\n      <ShallowRenderContext.Provider value>\n        {children}\n      </ShallowRenderContext.Provider>\n    </CollectionDocumentContext.Provider>\n  ), [children]);\n  // During SSR, we render the content directly, and append nodes to the document during render.\n  // The collection children return null so that nothing is actually rendered into the HTML.\n  return useIsSSR()\n    ? <SSRContext.Provider value={doc}>{wrappedChildren}</SSRContext.Provider>\n    : createPortal(wrappedChildren, doc as unknown as Element);\n}\n"],"names":[],"version":3,"file":"CollectionBuilder.module.js.map"}
+{"mappings":"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","sources":["packages/@react-aria/collections/src/CollectionBuilder.tsx"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {BaseCollection} from './BaseCollection';\nimport {BaseNode, Document, ElementNode} from './Document';\nimport {CachedChildrenOptions, useCachedChildren} from './useCachedChildren';\nimport {createPortal} from 'react-dom';\nimport {FocusableContext} from '@react-aria/interactions';\nimport {forwardRefType, Node} from '@react-types/shared';\nimport {Hidden} from './Hidden';\nimport React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react';\nimport {useIsSSR} from '@react-aria/ssr';\nimport {useLayoutEffect} from '@react-aria/utils';\nimport {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js';\n\nconst ShallowRenderContext = createContext(false);\nconst CollectionDocumentContext = createContext<Document<any, BaseCollection<any>> | null>(null);\n\nexport interface CollectionBuilderProps<C extends BaseCollection<object>> {\n  content: ReactNode,\n  children: (collection: C) => ReactNode,\n  createCollection?: () => C\n}\n\n/**\n * Builds a `Collection` from the children provided to the `content` prop, and passes it to the child render prop function.\n */\nexport function CollectionBuilder<C extends BaseCollection<object>>(props: CollectionBuilderProps<C>): ReactElement {\n  // If a document was provided above us, we're already in a hidden tree. Just render the content.\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    // The React types prior to 18 did not allow returning ReactNode from components\n    // even though the actual implementation since React 16 did.\n    // We must return ReactElement so that TS does not complain that <CollectionBuilder>\n    // is not a valid JSX element with React 16 and 17 types.\n    // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20544\n    return props.content as ReactElement;\n  }\n\n  // Otherwise, render a hidden copy of the children so that we can build the collection before constructing the state.\n  // This should always come before the real DOM content so we have built the collection by the time it renders during SSR.\n\n  // This is fine. CollectionDocumentContext never changes after mounting.\n  // eslint-disable-next-line react-hooks/rules-of-hooks\n  let {collection, document} = useCollectionDocument(props.createCollection);\n  return (\n    <>\n      <Hidden>\n        <CollectionDocumentContext.Provider value={document}>\n          {props.content}\n        </CollectionDocumentContext.Provider>\n      </Hidden>\n      <CollectionInner render={props.children} collection={collection} />\n    </>\n  );\n}\n\nfunction CollectionInner({collection, render}) {\n  return render(collection);\n}\n\ninterface CollectionDocumentResult<T, C extends BaseCollection<T>> {\n  collection: C,\n  document: Document<T, C>\n}\n\n// React 16 and 17 don't support useSyncExternalStore natively, and the shim provided by React does not support getServerSnapshot.\n// This wrapper uses the shim, but additionally calls getServerSnapshot during SSR (according to SSRProvider).\nfunction useSyncExternalStoreFallback<C>(subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => C, getServerSnapshot: () => C): C {\n  let isSSR = useIsSSR();\n  let isSSRRef = useRef(isSSR);\n  // This is read immediately inside the wrapper, which also runs during render.\n  // We just need a ref to avoid invalidating the callback itself, which\n  // would cause React to re-run the callback more than necessary.\n  // eslint-disable-next-line rulesdir/pure-render\n  isSSRRef.current = isSSR;\n\n  let getSnapshotWrapper = useCallback(() => {\n    return isSSRRef.current ? getServerSnapshot() : getSnapshot();\n  }, [getSnapshot, getServerSnapshot]);\n  return useSyncExternalStoreShim(subscribe, getSnapshotWrapper);\n}\n\nconst useSyncExternalStore = typeof React['useSyncExternalStore'] === 'function'\n  ? React['useSyncExternalStore']\n  : useSyncExternalStoreFallback;\n\nfunction useCollectionDocument<T extends object, C extends BaseCollection<T>>(createCollection?: () => C): CollectionDocumentResult<T, C> {\n  // The document instance is mutable, and should never change between renders.\n  // useSyncExternalStore is used to subscribe to updates, which vends immutable Collection objects.\n  let [document] = useState(() => new Document<T, C>(createCollection?.() || new BaseCollection() as C));\n  let subscribe = useCallback((fn: () => void) => document.subscribe(fn), [document]);\n  let getSnapshot = useCallback(() => {\n    let collection = document.getCollection();\n    if (document.isSSR) {\n      // After SSR is complete, reset the document to empty so it is ready for React to render the portal into.\n      // We do this _after_ getting the collection above so that the collection still has content in it from SSR\n      // during the current render, before React has finished the client render.\n      document.resetAfterSSR();\n    }\n    return collection;\n  }, [document]);\n  let getServerSnapshot = useCallback(() => {\n    document.isSSR = true;\n    return document.getCollection();\n  }, [document]);\n  let collection = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);\n  useLayoutEffect(() => {\n    document.isMounted = true;\n    return () => {\n      // Mark unmounted so we can skip all of the collection updates caused by\n      // React calling removeChild on every item in the collection.\n      document.isMounted = false;\n    };\n  }, [document]);\n  return {collection, document};\n}\n\nconst SSRContext = createContext<BaseNode<any> | null>(null);\n\nfunction useSSRCollectionNode<T extends Element>(Type: string, props: object, ref: ForwardedRef<T>, rendered?: any, children?: ReactNode, render?: (node: Node<T>) => ReactElement) {\n  // During SSR, portals are not supported, so the collection children will be wrapped in an SSRContext.\n  // Since SSR occurs only once, we assume that the elements are rendered in order and never re-render.\n  // Therefore we can create elements in our collection document during render so that they are in the\n  // collection by the time we need to use the collection to render to the real DOM.\n  // After hydration, we switch to client rendering using the portal.\n  let itemRef = useCallback((element: ElementNode<any> | null) => {\n    element?.setProps(props, ref, rendered, render);\n  }, [props, ref, rendered, render]);\n  let parentNode = useContext(SSRContext);\n  if (parentNode) {\n    // Guard against double rendering in strict mode.\n    let element = parentNode.ownerDocument.nodesByProps.get(props);\n    if (!element) {\n      element = parentNode.ownerDocument.createElement(Type);\n      element.setProps(props, ref, rendered, render);\n      parentNode.appendChild(element);\n      parentNode.ownerDocument.updateCollection();\n      parentNode.ownerDocument.nodesByProps.set(props, element);\n    }\n\n    return children\n      ? <SSRContext.Provider value={element}>{children}</SSRContext.Provider>\n      : null;\n  }\n\n  // @ts-ignore\n  return <Type ref={itemRef}>{children}</Type>;\n}\n\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactNode;\nexport function createLeafComponent<T extends object, P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement): (props: P & React.RefAttributes<T>) => ReactNode;\nexport function createLeafComponent<P extends object, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node?: any) => ReactElement): (props: P & React.RefAttributes<any>) => ReactNode {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let focusableProps = useContext(FocusableContext);\n    let isShallow = useContext(ShallowRenderContext);\n    if (!isShallow) {\n      if (render.length >= 3) {\n        throw new Error(render.name + ' cannot be rendered outside a collection.');\n      }\n      return render(props, ref);\n    }\n\n    return useSSRCollectionNode(\n      type,\n      props,\n      ref,\n      'children' in props ? props.children : null,\n      null,\n      node => (\n        // Forward FocusableContext to real DOM tree so tooltips work.\n        <FocusableContext.Provider value={focusableProps}>\n          <Component node={node} />\n        </FocusableContext.Provider>\n      )\n    );\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nexport function createBranchComponent<T extends object, P extends {children?: any}, E extends Element>(type: string, render: (props: P, ref: ForwardedRef<E>, node: Node<T>) => ReactElement, useChildren: (props: P) => ReactNode = useCollectionChildren): (props: P & React.RefAttributes<E>) => ReactNode {\n  let Component = ({node}) => render(node.props, node.props.ref, node);\n  let Result = (forwardRef as forwardRefType)((props: P, ref: ForwardedRef<E>) => {\n    let children = useChildren(props);\n    return useSSRCollectionNode(type, props, ref, null, children, node => <Component node={node} />) ?? <></>;\n  });\n  // @ts-ignore\n  Result.displayName = render.name;\n  return Result;\n}\n\nfunction useCollectionChildren<T extends object>(options: CachedChildrenOptions<T>) {\n  return useCachedChildren({...options, addIdAndValue: true});\n}\n\nexport interface CollectionProps<T> extends CachedChildrenOptions<T> {}\n\nconst CollectionContext = createContext<CachedChildrenOptions<unknown> | null>(null);\n\n/** A Collection renders a list of items, automatically managing caching and keys. */\nexport function Collection<T extends object>(props: CollectionProps<T>): JSX.Element {\n  let ctx = useContext(CollectionContext)!;\n  let dependencies = (ctx?.dependencies || []).concat(props.dependencies);\n  let idScope = props.idScope || ctx?.idScope;\n  let children = useCollectionChildren({\n    ...props,\n    idScope,\n    dependencies\n  });\n\n  let doc = useContext(CollectionDocumentContext);\n  if (doc) {\n    children = <CollectionRoot>{children}</CollectionRoot>;\n  }\n\n  // Propagate dependencies and idScope to child collections.\n  ctx = useMemo(() => ({\n    dependencies,\n    idScope\n  // eslint-disable-next-line react-hooks/exhaustive-deps\n  }), [idScope, ...dependencies]);\n\n  return (\n    <CollectionContext.Provider value={ctx}>\n      {children}\n    </CollectionContext.Provider>\n  );\n}\n\nfunction CollectionRoot({children}) {\n  let doc = useContext(CollectionDocumentContext);\n  let wrappedChildren = useMemo(() => (\n    <CollectionDocumentContext.Provider value={null}>\n      <ShallowRenderContext.Provider value>\n        {children}\n      </ShallowRenderContext.Provider>\n    </CollectionDocumentContext.Provider>\n  ), [children]);\n  // During SSR, we render the content directly, and append nodes to the document during render.\n  // The collection children return null so that nothing is actually rendered into the HTML.\n  return useIsSSR()\n    ? <SSRContext.Provider value={doc}>{wrappedChildren}</SSRContext.Provider>\n    : createPortal(wrappedChildren, doc as unknown as Element);\n}\n"],"names":[],"version":3,"file":"CollectionBuilder.module.js.map"}

package/dist/Document.main.js

@@ -64,8 +64,18 @@ class $c20afee375f3b2d6$export$410b0c854570d131 {
         var _this_parentNode;
         return ((_this_parentNode = this.parentNode) === null || _this_parentNode === void 0 ? void 0 : _this_parentNode.isConnected) || false;
     }
+    invalidateChildIndices(child) {
+        if (this._minInvalidChildIndex == null || child.index < this._minInvalidChildIndex.index) this._minInvalidChildIndex = child;
+    }
+    updateChildIndices() {
+        let node = this._minInvalidChildIndex;
+        while(node){
+            node.index = node.previousSibling ? node.previousSibling.index + 1 : 0;
+            node = node.nextSibling;
+        }
+        this._minInvalidChildIndex = null;
+    }
     appendChild(child) {
-        this.ownerDocument.startTransaction();
         if (child.parentNode) child.parentNode.removeChild(child);
         if (this.firstChild == null) this.firstChild = child;
         if (this.lastChild) {
@@ -80,15 +90,10 @@ class $c20afee375f3b2d6$export$410b0c854570d131 {
         child.nextSibling = null;
         this.lastChild = child;
         this.ownerDocument.markDirty(this);
-        if (child.hasSetProps) // Only add the node to the collection if we already received props for it.
-        // Otherwise wait until then so we have the correct id for the node.
-        this.ownerDocument.addNode(child);
-        this.ownerDocument.endTransaction();
         this.ownerDocument.queueUpdate();
     }
     insertBefore(newNode, referenceNode) {
         if (referenceNode == null) return this.appendChild(newNode);
-        this.ownerDocument.startTransaction();
         if (newNode.parentNode) newNode.parentNode.removeChild(newNode);
         newNode.nextSibling = referenceNode;
         newNode.previousSibling = referenceNode.previousSibling;
@@ -97,24 +102,15 @@ class $c20afee375f3b2d6$export$410b0c854570d131 {
         else if (referenceNode.previousSibling) referenceNode.previousSibling.nextSibling = newNode;
         referenceNode.previousSibling = newNode;
         newNode.parentNode = referenceNode.parentNode;
-        let node = referenceNode;
-        while(node){
-            node.index++;
-            node = node.nextSibling;
-        }
-        if (newNode.hasSetProps) this.ownerDocument.addNode(newNode);
-        this.ownerDocument.endTransaction();
+        this.invalidateChildIndices(referenceNode);
         this.ownerDocument.queueUpdate();
     }
     removeChild(child) {
         if (child.parentNode !== this || !this.ownerDocument.isMounted) return;
-        this.ownerDocument.startTransaction();
-        let node = child.nextSibling;
-        while(node){
-            node.index--;
-            node = node.nextSibling;
+        if (child.nextSibling) {
+            this.invalidateChildIndices(child.nextSibling);
+            child.nextSibling.previousSibling = child.previousSibling;
         }
-        if (child.nextSibling) child.nextSibling.previousSibling = child.previousSibling;
         if (child.previousSibling) child.previousSibling.nextSibling = child.nextSibling;
         if (this.firstChild === child) this.firstChild = child.nextSibling;
         if (this.lastChild === child) this.lastChild = child.previousSibling;
@@ -122,18 +118,38 @@ class $c20afee375f3b2d6$export$410b0c854570d131 {
         child.nextSibling = null;
         child.previousSibling = null;
         child.index = 0;
-        this.ownerDocument.removeNode(child);
-        this.ownerDocument.endTransaction();
+        this.ownerDocument.markDirty(child);
         this.ownerDocument.queueUpdate();
     }
     addEventListener() {}
     removeEventListener() {}
+    get previousVisibleSibling() {
+        let node = this.previousSibling;
+        while(node && node.isHidden)node = node.previousSibling;
+        return node;
+    }
+    get nextVisibleSibling() {
+        let node = this.nextSibling;
+        while(node && node.isHidden)node = node.nextSibling;
+        return node;
+    }
+    get firstVisibleChild() {
+        let node = this.firstChild;
+        while(node && node.isHidden)node = node.nextSibling;
+        return node;
+    }
+    get lastVisibleChild() {
+        let node = this.lastChild;
+        while(node && node.isHidden)node = node.previousSibling;
+        return node;
+    }
     constructor(ownerDocument){
         this._firstChild = null;
         this._lastChild = null;
         this._previousSibling = null;
         this._nextSibling = null;
         this._parentNode = null;
+        this._minInvalidChildIndex = null;
         this.ownerDocument = ownerDocument;
     }
 }
@@ -149,62 +165,97 @@ class $c20afee375f3b2d6$export$dc064fe9e59310fd extends $c20afee375f3b2d6$export
         if (this.parentNode instanceof $c20afee375f3b2d6$export$dc064fe9e59310fd) return this.parentNode.level + (this.node.type === 'item' ? 1 : 0);
         return 0;
     }
+    /**
+   * Lazily gets a mutable instance of a Node. If the node has already
+   * been cloned during this update cycle, it just returns the existing one.
+   */ getMutableNode() {
+        if (!this.isMutated) {
+            this.node = this.node.clone();
+            this.isMutated = true;
+        }
+        this.ownerDocument.markDirty(this);
+        return this.node;
+    }
     updateNode() {
-        var _this_previousSibling, _this_nextSibling, _this_firstChild, _this_lastChild;
-        let node = this.ownerDocument.getMutableNode(this);
+        var _this_previousVisibleSibling, _this_firstVisibleChild, _this_lastVisibleChild;
+        let nextSibling = this.nextVisibleSibling;
+        let node = this.getMutableNode();
         node.index = this.index;
         node.level = this.level;
         node.parentKey = this.parentNode instanceof $c20afee375f3b2d6$export$dc064fe9e59310fd ? this.parentNode.node.key : null;
-        var _this_previousSibling_node_key;
-        node.prevKey = (_this_previousSibling_node_key = (_this_previousSibling = this.previousSibling) === null || _this_previousSibling === void 0 ? void 0 : _this_previousSibling.node.key) !== null && _this_previousSibling_node_key !== void 0 ? _this_previousSibling_node_key : null;
-        var _this_nextSibling_node_key;
-        node.nextKey = (_this_nextSibling_node_key = (_this_nextSibling = this.nextSibling) === null || _this_nextSibling === void 0 ? void 0 : _this_nextSibling.node.key) !== null && _this_nextSibling_node_key !== void 0 ? _this_nextSibling_node_key : null;
+        var _this_previousVisibleSibling_node_key;
+        node.prevKey = (_this_previousVisibleSibling_node_key = (_this_previousVisibleSibling = this.previousVisibleSibling) === null || _this_previousVisibleSibling === void 0 ? void 0 : _this_previousVisibleSibling.node.key) !== null && _this_previousVisibleSibling_node_key !== void 0 ? _this_previousVisibleSibling_node_key : null;
+        var _nextSibling_node_key;
+        node.nextKey = (_nextSibling_node_key = nextSibling === null || nextSibling === void 0 ? void 0 : nextSibling.node.key) !== null && _nextSibling_node_key !== void 0 ? _nextSibling_node_key : null;
         node.hasChildNodes = !!this.firstChild;
-        var _this_firstChild_node_key;
-        node.firstChildKey = (_this_firstChild_node_key = (_this_firstChild = this.firstChild) === null || _this_firstChild === void 0 ? void 0 : _this_firstChild.node.key) !== null && _this_firstChild_node_key !== void 0 ? _this_firstChild_node_key : null;
-        var _this_lastChild_node_key;
-        node.lastChildKey = (_this_lastChild_node_key = (_this_lastChild = this.lastChild) === null || _this_lastChild === void 0 ? void 0 : _this_lastChild.node.key) !== null && _this_lastChild_node_key !== void 0 ? _this_lastChild_node_key : null;
+        var _this_firstVisibleChild_node_key;
+        node.firstChildKey = (_this_firstVisibleChild_node_key = (_this_firstVisibleChild = this.firstVisibleChild) === null || _this_firstVisibleChild === void 0 ? void 0 : _this_firstVisibleChild.node.key) !== null && _this_firstVisibleChild_node_key !== void 0 ? _this_firstVisibleChild_node_key : null;
+        var _this_lastVisibleChild_node_key;
+        node.lastChildKey = (_this_lastVisibleChild_node_key = (_this_lastVisibleChild = this.lastVisibleChild) === null || _this_lastVisibleChild === void 0 ? void 0 : _this_lastVisibleChild.node.key) !== null && _this_lastVisibleChild_node_key !== void 0 ? _this_lastVisibleChild_node_key : null;
+        // Update the colIndex of sibling nodes if this node has a colSpan.
+        if ((node.colSpan != null || node.colIndex != null) && nextSibling) {
+            var _node_colIndex, _node_colSpan;
+            // This queues the next sibling for update, which means this happens recursively.
+            let nextColIndex = ((_node_colIndex = node.colIndex) !== null && _node_colIndex !== void 0 ? _node_colIndex : node.index) + ((_node_colSpan = node.colSpan) !== null && _node_colSpan !== void 0 ? _node_colSpan : 1);
+            if (nextColIndex !== nextSibling.node.colIndex) {
+                let siblingNode = nextSibling.getMutableNode();
+                siblingNode.colIndex = nextColIndex;
+            }
+        }
     }
     setProps(obj, ref, rendered, render) {
-        let node = this.ownerDocument.getMutableNode(this);
-        let { value: value, textValue: textValue, id: id, ...props } = obj;
+        let node = this.getMutableNode();
+        let { value: value1, textValue: textValue, id: id, ...props } = obj;
         props.ref = ref;
         node.props = props;
         node.rendered = rendered;
         node.render = render;
-        node.value = value;
+        node.value = value1;
         node.textValue = textValue || (typeof props.children === 'string' ? props.children : '') || obj['aria-label'] || '';
         if (id != null && id !== node.key) {
             if (this.hasSetProps) throw new Error('Cannot change the id of an item');
             node.key = id;
         }
-        // If this is the first time props have been set, end the transaction started in the constructor
-        // so this node can be emitted.
-        if (!this.hasSetProps) {
-            this.ownerDocument.addNode(this);
-            this.ownerDocument.endTransaction();
-            this.hasSetProps = true;
-        }
+        if (props.colSpan != null) node.colSpan = props.colSpan;
+        this.hasSetProps = true;
         this.ownerDocument.queueUpdate();
     }
     get style() {
-        return {};
+        // React sets display: none to hide elements during Suspense.
+        // We'll handle this by setting the element to hidden and invalidating
+        // its siblings/parent. Hidden elements remain in the Document, but
+        // are removed from the Collection.
+        let element = this;
+        return {
+            get display () {
+                return element.isHidden ? 'none' : '';
+            },
+            set display (value){
+                let isHidden = value === 'none';
+                if (element.isHidden !== isHidden) {
+                    var _element_parentNode, _element_parentNode1;
+                    // Mark parent node dirty if this element is currently the first or last visible child.
+                    if (((_element_parentNode = element.parentNode) === null || _element_parentNode === void 0 ? void 0 : _element_parentNode.firstVisibleChild) === element || ((_element_parentNode1 = element.parentNode) === null || _element_parentNode1 === void 0 ? void 0 : _element_parentNode1.lastVisibleChild) === element) element.ownerDocument.markDirty(element.parentNode);
+                    // Mark sibling visible elements dirty.
+                    let prev = element.previousVisibleSibling;
+                    let next = element.nextVisibleSibling;
+                    if (prev) element.ownerDocument.markDirty(prev);
+                    if (next) element.ownerDocument.markDirty(next);
+                    // Mark self dirty.
+                    element.isHidden = isHidden;
+                    element.ownerDocument.markDirty(element);
+                }
+            }
+        };
     }
     hasAttribute() {}
     setAttribute() {}
     setAttributeNS() {}
     removeAttribute() {}
     constructor(type, ownerDocument){
-        super(ownerDocument);
-        this.nodeType = 8 // COMMENT_NODE (we'd use ELEMENT_NODE but React DevTools will fail to get its dimensions)
-        ;
-        this._index = 0;
-        this.hasSetProps = false;
+        super(ownerDocument), this.nodeType = 8 // COMMENT_NODE (we'd use ELEMENT_NODE but React DevTools will fail to get its dimensions)
+        , this.isMutated = true, this._index = 0, this.hasSetProps = false, this.isHidden = false;
         this.node = new (0, $499e2959ba1abacc$exports.CollectionNode)(type, `react-aria-${++ownerDocument.nodeId}`);
-        // Start a transaction so that no updates are emitted from the collection
-        // until the props for this node are set. We don't know the real id for the
-        // node until then, so we need to avoid emitting collections in an inconsistent state.
-        this.ownerDocument.startTransaction();
     }
 }
 class $c20afee375f3b2d6$export$b34a105447964f9f extends $c20afee375f3b2d6$export$410b0c854570d131 {
@@ -214,72 +265,70 @@ class $c20afee375f3b2d6$export$b34a105447964f9f extends $c20afee375f3b2d6$export
     createElement(type) {
         return new $c20afee375f3b2d6$export$dc064fe9e59310fd(type, this);
     }
-    /**
-   * Lazily gets a mutable instance of a Node. If the node has already
-   * been cloned during this update cycle, it just returns the existing one.
-   */ getMutableNode(element) {
-        let node = element.node;
-        if (!this.mutatedNodes.has(element)) {
-            node = element.node.clone();
-            this.mutatedNodes.add(element);
-            element.node = node;
-        }
-        this.markDirty(element);
-        return node;
-    }
     getMutableCollection() {
-        if (!this.isSSR && !this.collectionMutated) {
-            this.collection = this.collection.clone();
-            this.collectionMutated = true;
-        }
-        return this.collection;
+        if (!this.nextCollection) this.nextCollection = this.collection.clone();
+        return this.nextCollection;
     }
     markDirty(node) {
         this.dirtyNodes.add(node);
     }
-    startTransaction() {
-        this.transactionCount++;
-    }
-    endTransaction() {
-        this.transactionCount--;
-    }
     addNode(element) {
+        if (element.isHidden) return;
         let collection = this.getMutableCollection();
-        if (!collection.getItem(element.node.key)) {
-            collection.addNode(element.node);
-            for (let child of element)this.addNode(child);
-        }
-        this.markDirty(element);
+        if (!collection.getItem(element.node.key)) for (let child of element)this.addNode(child);
+        collection.addNode(element.node);
     }
     removeNode(node) {
         for (let child of node)this.removeNode(child);
         let collection = this.getMutableCollection();
         collection.removeNode(node.node.key);
-        this.markDirty(node);
     }
     /** Finalizes the collection update, updating all nodes and freezing the collection. */ getCollection() {
-        if (this.transactionCount > 0) return this.collection;
+        // If in a subscription update, return a clone of the existing collection.
+        // This ensures React will queue a render. React will call getCollection again
+        // during render, at which point all the updates will be complete and we can return
+        // the new collection.
+        if (this.inSubscription) return this.collection.clone();
+        // Reset queuedRender to false when getCollection is called during render.
+        this.queuedRender = false;
         this.updateCollection();
         return this.collection;
     }
     updateCollection() {
-        for (let element of this.dirtyNodes)if (element instanceof $c20afee375f3b2d6$export$dc064fe9e59310fd && element.isConnected) element.updateNode();
+        // First, remove disconnected nodes and update the indices of dirty element children.
+        for (let element of this.dirtyNodes)if (element instanceof $c20afee375f3b2d6$export$dc064fe9e59310fd && (!element.isConnected || element.isHidden)) this.removeNode(element);
+        else element.updateChildIndices();
+        // Next, update dirty collection nodes.
+        for (let element of this.dirtyNodes)if (element instanceof $c20afee375f3b2d6$export$dc064fe9e59310fd) {
+            if (element.isConnected && !element.isHidden) {
+                element.updateNode();
+                this.addNode(element);
+            }
+            element.isMutated = false;
+        }
         this.dirtyNodes.clear();
-        if (this.mutatedNodes.size || this.collectionMutated) {
-            var _this_firstChild, _this_lastChild;
-            let collection = this.getMutableCollection();
-            for (let element of this.mutatedNodes)if (element.isConnected) collection.addNode(element.node);
-            var _this_firstChild_node_key, _this_lastChild_node_key;
-            collection.commit((_this_firstChild_node_key = (_this_firstChild = this.firstChild) === null || _this_firstChild === void 0 ? void 0 : _this_firstChild.node.key) !== null && _this_firstChild_node_key !== void 0 ? _this_firstChild_node_key : null, (_this_lastChild_node_key = (_this_lastChild = this.lastChild) === null || _this_lastChild === void 0 ? void 0 : _this_lastChild.node.key) !== null && _this_lastChild_node_key !== void 0 ? _this_lastChild_node_key : null, this.isSSR);
-            this.mutatedNodes.clear();
+        // Finally, update the collection.
+        if (this.nextCollection) {
+            var _this_firstVisibleChild, _this_lastVisibleChild;
+            var _this_firstVisibleChild_node_key, _this_lastVisibleChild_node_key;
+            this.nextCollection.commit((_this_firstVisibleChild_node_key = (_this_firstVisibleChild = this.firstVisibleChild) === null || _this_firstVisibleChild === void 0 ? void 0 : _this_firstVisibleChild.node.key) !== null && _this_firstVisibleChild_node_key !== void 0 ? _this_firstVisibleChild_node_key : null, (_this_lastVisibleChild_node_key = (_this_lastVisibleChild = this.lastVisibleChild) === null || _this_lastVisibleChild === void 0 ? void 0 : _this_lastVisibleChild.node.key) !== null && _this_lastVisibleChild_node_key !== void 0 ? _this_lastVisibleChild_node_key : null, this.isSSR);
+            if (!this.isSSR) {
+                this.collection = this.nextCollection;
+                this.nextCollection = null;
+            }
         }
-        this.collectionMutated = false;
     }
     queueUpdate() {
-        // Don't emit any updates if there is a transaction in progress.
-        // queueUpdate should be called again after the transaction.
-        if (this.dirtyNodes.size === 0 || this.transactionCount > 0) return;
+        if (this.dirtyNodes.size === 0 || this.queuedRender) return;
+        // Only trigger subscriptions once during an update, when the first item changes.
+        // React's useSyncExternalStore will call getCollection immediately, to check whether the snapshot changed.
+        // If so, React will queue a render to happen after the current commit to our fake DOM finishes.
+        // We track whether getCollection is called in a subscription, and once it is called during render,
+        // we reset queuedRender back to false.
+        this.queuedRender = true;
+        this.inSubscription = true;
         for (let fn of this.subscriptions)fn();
+        this.inSubscription = false;
     }
     subscribe(fn) {
         this.subscriptions.add(fn);
@@ -295,20 +344,10 @@ class $c20afee375f3b2d6$export$b34a105447964f9f extends $c20afee375f3b2d6$export
     }
     constructor(collection){
         // @ts-ignore
-        super(null);
-        this.nodeType = 11 // DOCUMENT_FRAGMENT_NODE
-        ;
-        this.ownerDocument = this;
-        this.dirtyNodes = new Set();
-        this.isSSR = false;
-        this.nodeId = 0;
-        this.nodesByProps = new WeakMap();
-        this.isMounted = true;
-        this.mutatedNodes = new Set();
-        this.subscriptions = new Set();
-        this.transactionCount = 0;
+        super(null), this.nodeType = 11 // DOCUMENT_FRAGMENT_NODE
+        , this.ownerDocument = this, this.dirtyNodes = new Set(), this.isSSR = false, this.nodeId = 0, this.nodesByProps = new WeakMap(), this.isMounted = true, this.nextCollection = null, this.subscriptions = new Set(), this.queuedRender = false, this.inSubscription = false;
         this.collection = collection;
-        this.collectionMutated = true;
+        this.nextCollection = collection;
     }
 }