@dxos/react-ui-attention 0.6.12-main.5cc132e → 0.6.12-main.89e9959

package/dist/lib/browser/index.mjs

@@ -47,26 +47,63 @@ var AttentionGlyph = /* @__PURE__ */ forwardRef(({ presence, classNames, ...prop
 
 // packages/ui/react-ui-attention/src/components/AttentionProvider.tsx
 import { createContext } from "@radix-ui/react-context";
-import { useControllableState } from "@radix-ui/react-use-controllable-state";
-import React2 from "react";
+import React2, { useMemo } from "react";
+import { create } from "@dxos/echo-schema";
+import { useDefaultValue } from "@dxos/react-ui";
 var ATTENTION_NAME = "Attention";
+var ATTENABLE_ATTRIBUTE = "data-attendable-id";
+var ATTENTION_SOURCE_ATTRIBUTE = "data-is-attention-source";
 var [AttentionContextProvider, useAttentionContext] = createContext(ATTENTION_NAME, {
-  attended: /* @__PURE__ */ new Set()
+  attention: {
+    attended: []
+  },
+  path: []
 });
-var useHasAttention = (attendableId) => {
-  const { attended } = useAttentionContext(ATTENTION_NAME);
-  return attendableId ? attended.has(attendableId) : false;
-};
-var useIsDirectlyAttended = (attendableId) => {
-  const { attended } = useAttentionContext(ATTENTION_NAME);
-  const attendedArray = Array.from(attended);
-  return attendedArray.length === 1 && attendedArray[0] === attendableId;
-};
-var createAttendableAttributes = (attendableId) => {
+var useAttention = (attendableId) => {
+  const { attention, path } = useAttentionContext(ATTENTION_NAME);
+  if (!attendableId) {
+    return {
+      hasAttention: false,
+      isAncestor: false,
+      isRelated: false
+    };
+  }
+  const current = [
+    attendableId,
+    ...path
+  ];
+  const hasAttention = current.length === attention.attended.length && current.every((id, index) => attention.attended[index] === id);
+  const isAncestor = current.length < attention.attended.length && attention.attended.slice(-current.length).every((id, index) => current[index] === id);
+  const isRelated = attendableId === attention.attended[0];
   return {
-    "data-attendable-id": attendableId
+    hasAttention,
+    isAncestor,
+    isRelated
   };
 };
+var useAttended = () => {
+  const { attention } = useAttentionContext(ATTENTION_NAME);
+  return attention.attended;
+};
+var useAttendableAttributes = (attendableId) => {
+  const { hasAttention } = useAttention(attendableId);
+  return useMemo(() => {
+    const attributes = {
+      [ATTENABLE_ATTRIBUTE]: attendableId
+    };
+    if (hasAttention) {
+      attributes[ATTENTION_SOURCE_ATTRIBUTE] = "true";
+    }
+    return attributes;
+  }, [
+    attendableId,
+    hasAttention
+  ]);
+};
+var useAttentionPath = () => {
+  const { path } = useAttentionContext(ATTENTION_NAME);
+  return path;
+};
 var getAttendables = (selector, cursor, acc = []) => {
   const closestAttendable = cursor.closest(selector);
   if (!closestAttendable) {
@@ -86,39 +123,56 @@ var getAttendables = (selector, cursor, acc = []) => {
     }
   }
 };
-var AttentionProvider = ({ children, attended: propsAttended, defaultAttended, onChangeAttend }) => {
-  const [attended = /* @__PURE__ */ new Set(), setAttended] = useControllableState({
-    prop: propsAttended,
-    defaultProp: defaultAttended,
-    onChange: onChangeAttend
-  });
+var RootAttentionProvider = ({ children, attention: propsAttention, onChange }) => {
+  const attention = useDefaultValue(propsAttention, () => create({
+    attended: []
+  }));
   const handleFocus = (event) => {
     const selector = [
       "[data-attendable-id]",
       ...Array.from(document.querySelectorAll("[aria-controls]")).map((el) => `[id="${el.getAttribute("aria-controls")}"]`)
     ].join(",");
-    const nextAttended = new Set(getAttendables(selector, event.target));
-    const [prev, next] = [
-      Array.from(attended),
-      Array.from(nextAttended)
-    ];
-    (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id)) && setAttended(nextAttended);
+    const prev = attention.attended;
+    const next = Array.from(new Set(getAttendables(selector, event.target)));
+    if (next.length > 0 && (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id))) {
+      attention.attended = next;
+      onChange?.(next);
+    }
   };
   return /* @__PURE__ */ React2.createElement(AttentionContextProvider, {
-    attended
+    attention,
+    path: []
   }, /* @__PURE__ */ React2.createElement("div", {
     role: "none",
     className: "contents",
     onFocusCapture: handleFocus
   }, children));
 };
+var AttentionProvider = ({ id, children }) => {
+  const { attention, path } = useAttentionContext(ATTENTION_NAME);
+  const nextPath = useMemo(() => [
+    id,
+    ...path
+  ], [
+    id,
+    path
+  ]);
+  return /* @__PURE__ */ React2.createElement(AttentionContextProvider, {
+    attention,
+    path: nextPath
+  }, children);
+};
 export {
+  ATTENABLE_ATTRIBUTE,
   ATTENTION_NAME,
+  ATTENTION_SOURCE_ATTRIBUTE,
   AttentionGlyph,
   AttentionProvider,
-  createAttendableAttributes,
+  RootAttentionProvider,
+  useAttendableAttributes,
+  useAttended,
+  useAttention,
   useAttentionContext,
-  useHasAttention,
-  useIsDirectlyAttended
+  useAttentionPath
 };
 //# sourceMappingURL=index.mjs.map

package/dist/lib/browser/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/AttentionGlyph.tsx", "../../../src/components/AttentionProvider.tsx"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Primitive } from '@radix-ui/react-primitive';\nimport React, { type ComponentPropsWithRef, forwardRef } from 'react';\n\nimport { type ThemedClassName } from '@dxos/react-ui';\nimport { mx } from '@dxos/react-ui-theme';\n\nconst attentionGlyphStyles =\n  'inline-block rounded-sm is-3 bs-3 bg-transparent text-accentText transition-colors [[data-attention=true]_&]:bg-accentSurface [[data-attention=true]_&]:text-inverse [[aria-current][data-attention=true]_&]:bg-accentSurface [[aria-current][data-attention=true]_&]:text-inverse';\n\nconst presenceIconStyles =\n  'is-3 bs-3 group-[[aria-current]_&:hover]/attentionGlyphButton:hidden group-[[aria-current]_&:focus]/attentionGlyphButton:hidden group-[[data-attention=true]_&:hover]/attentionGlyphButton:hidden group-[[data-attention=true]_&:focus]/attentionGlyphButton:hidden group-[[aria-current][data-attention=true]_&:hover]/attentionGlyphButton:hidden group-[[aria-current][data-attention=true]_&:focus]/attentionGlyphButton:hidden';\n\nconst PresenceOne = () => {\n  return (\n    <svg\n      width='12'\n      height='12'\n      viewBox='0 0 12 12'\n      className={presenceIconStyles}\n      fill='none'\n      xmlns='http://www.w3.org/2000/svg'\n    >\n      <circle cx='6' cy='6' r='2.5' fill='currentColor' />\n    </svg>\n  );\n};\n\nconst PresenceMany = () => {\n  return (\n    <svg\n      width='12'\n      height='12'\n      viewBox='0 0 12 12'\n      className={presenceIconStyles}\n      fill='none'\n      xmlns='http://www.w3.org/2000/svg'\n    >\n      <path\n        d='M6.75 8.27311C7.38815 7.72296 7.79212 6.90866 7.79212 6C7.79212 5.09134 7.38815 4.27704 6.75 3.72689C7.06722 3.58122 7.42019 3.5 7.79212 3.5C9.17283 3.5 10.2921 4.61929 10.2921 6C10.2921 7.38071 9.17283 8.5 7.79212 8.5C7.42019 8.5 7.06723 8.41878 6.75 8.27311Z'\n        fill='currentColor'\n      />\n      <circle cx='4.25' cy='6' r='2.5' fill='currentColor' />\n    </svg>\n  );\n};\n\nexport type AttentionGlyphProps = {\n  presence?: 'none' | 'one' | 'many';\n} & ThemedClassName<Omit<ComponentPropsWithRef<typeof Primitive.span>, 'children'>>;\n\nexport const AttentionGlyph = forwardRef<HTMLSpanElement, AttentionGlyphProps>(\n  ({ presence, classNames, ...props }, forwardedRef) => {\n    return (\n      <span role='none' {...props} className={mx(attentionGlyphStyles, classNames)} ref={forwardedRef}>\n        {presence === 'many' && <PresenceMany />}\n        {presence === 'one' && <PresenceOne />}\n      </span>\n    );\n  },\n);\n", "//\n// Copyright 2024 DXOS.org\n//\n\n// NOTE(thure): The following unused imports quell TS2742 (“likely not portable”).\n\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { createContext, type Scope, type CreateScope } from '@radix-ui/react-context';\nimport { useControllableState } from '@radix-ui/react-use-controllable-state';\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport React, { ComponentProps, type FocusEvent, type HTMLAttributes, type PropsWithChildren, useState } from 'react';\n\nconst ATTENTION_NAME = 'Attention';\n\ntype AttentionContextValue = {\n  attended: Set<string>;\n};\n\nconst [AttentionContextProvider, useAttentionContext] = createContext<AttentionContextValue>(ATTENTION_NAME, {\n  attended: new Set(),\n});\n\nconst useHasAttention = (attendableId?: string) => {\n  const { attended } = useAttentionContext(ATTENTION_NAME);\n  return attendableId ? attended.has(attendableId) : false;\n};\n\nconst useIsDirectlyAttended = (attendableId?: string) => {\n  const { attended } = useAttentionContext(ATTENTION_NAME);\n  const attendedArray = Array.from(attended);\n  return attendedArray.length === 1 && attendedArray[0] === attendableId;\n};\n\n/**\n * Computes HTML element attributes to apply so the attention system can detect changes\n * @param attendableId\n */\nconst createAttendableAttributes = (attendableId?: string) => {\n  return { 'data-attendable-id': attendableId };\n};\n\n/**\n * Accumulates all attendable id’s between the element provided and the root, inclusive.\n */\nconst getAttendables = (selector: string, cursor: Element, acc: string[] = []): string[] => {\n  // Find the closest element with `data-attendable-id`, if any; start from cursor and move up the DOM tree.\n  const closestAttendable = cursor.closest(selector);\n  if (!closestAttendable) {\n    return acc;\n  } else {\n    const attendableId = closestAttendable.getAttribute('data-attendable-id');\n    if (!attendableId) {\n      // this has an id of an aria-controls elsewhere on the page, move cursor to that trigger\n      const trigger = document.querySelector(`[aria-controls=\"${closestAttendable.getAttribute('id')}\"]`);\n      if (!trigger) {\n        return acc;\n      } else {\n        return getAttendables(selector, trigger, acc);\n      }\n    } else {\n      acc.push(attendableId);\n      // (attempt tail recursion)\n      return !closestAttendable.parentElement ? acc : getAttendables(selector, closestAttendable.parentElement, acc);\n    }\n  }\n};\n\nconst AttentionProvider = ({\n  children,\n  attended: propsAttended,\n  defaultAttended,\n  onChangeAttend,\n}: PropsWithChildren<\n  Partial<{\n    attended: Set<string>;\n    onChangeAttend: (nextAttended: Set<string>) => void;\n    defaultAttended: Set<string>;\n  }>\n>) => {\n  const [attended = new Set(), setAttended] = useControllableState<Set<string>>({\n    prop: propsAttended,\n    defaultProp: defaultAttended,\n    onChange: onChangeAttend,\n  });\n  const handleFocus = (event: FocusEvent) => {\n    const selector = [\n      '[data-attendable-id]',\n      ...Array.from(document.querySelectorAll('[aria-controls]')).map(\n        (el) => `[id=\"${el.getAttribute('aria-controls')}\"]`,\n      ),\n    ].join(',');\n    const nextAttended = new Set(getAttendables(selector, event.target));\n    const [prev, next] = [Array.from(attended), Array.from(nextAttended)];\n    // Only update state if the result is different.\n    (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id)) && setAttended(nextAttended);\n  };\n  return (\n    <AttentionContextProvider attended={attended}>\n      <div role='none' className='contents' onFocusCapture={handleFocus}>\n        {children}\n      </div>\n    </AttentionContextProvider>\n  );\n};\n\nexport {\n  AttentionProvider,\n  useAttentionContext,\n  useHasAttention,\n  useIsDirectlyAttended,\n  createAttendableAttributes,\n  ATTENTION_NAME,\n};\n\nexport type { AttentionContextValue };\n"],
-  "mappings": "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",
-  "names": ["React", "forwardRef", "mx", "attentionGlyphStyles", "presenceIconStyles", "PresenceOne", "svg", "width", "height", "viewBox", "className", "fill", "xmlns", "circle", "cx", "cy", "r", "PresenceMany", "path", "d", "AttentionGlyph", "forwardRef", "presence", "classNames", "props", "forwardedRef", "span", "role", "mx", "ref", "createContext", "useControllableState", "React", "ATTENTION_NAME", "AttentionContextProvider", "useAttentionContext", "createContext", "attended", "Set", "useHasAttention", "attendableId", "has", "useIsDirectlyAttended", "attendedArray", "Array", "from", "length", "createAttendableAttributes", "getAttendables", "selector", "cursor", "acc", "closestAttendable", "closest", "getAttribute", "trigger", "document", "querySelector", "push", "parentElement", "AttentionProvider", "children", "propsAttended", "defaultAttended", "onChangeAttend", "setAttended", "useControllableState", "prop", "defaultProp", "onChange", "handleFocus", "event", "querySelectorAll", "map", "el", "join", "nextAttended", "target", "prev", "next", "find", "id", "index", "React", "div", "role", "className", "onFocusCapture"]
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Primitive } from '@radix-ui/react-primitive';\nimport React, { type ComponentPropsWithRef, forwardRef } from 'react';\n\nimport { type ThemedClassName } from '@dxos/react-ui';\nimport { mx } from '@dxos/react-ui-theme';\n\nconst attentionGlyphStyles =\n  'inline-block rounded-sm is-3 bs-3 bg-transparent text-accentText transition-colors [[data-attention=true]_&]:bg-accentSurface [[data-attention=true]_&]:text-inverse [[aria-current][data-attention=true]_&]:bg-accentSurface [[aria-current][data-attention=true]_&]:text-inverse';\n\nconst presenceIconStyles =\n  'is-3 bs-3 group-[[aria-current]_&:hover]/attentionGlyphButton:hidden group-[[aria-current]_&:focus]/attentionGlyphButton:hidden group-[[data-attention=true]_&:hover]/attentionGlyphButton:hidden group-[[data-attention=true]_&:focus]/attentionGlyphButton:hidden group-[[aria-current][data-attention=true]_&:hover]/attentionGlyphButton:hidden group-[[aria-current][data-attention=true]_&:focus]/attentionGlyphButton:hidden';\n\nconst PresenceOne = () => {\n  return (\n    <svg\n      width='12'\n      height='12'\n      viewBox='0 0 12 12'\n      className={presenceIconStyles}\n      fill='none'\n      xmlns='http://www.w3.org/2000/svg'\n    >\n      <circle cx='6' cy='6' r='2.5' fill='currentColor' />\n    </svg>\n  );\n};\n\nconst PresenceMany = () => {\n  return (\n    <svg\n      width='12'\n      height='12'\n      viewBox='0 0 12 12'\n      className={presenceIconStyles}\n      fill='none'\n      xmlns='http://www.w3.org/2000/svg'\n    >\n      <path\n        d='M6.75 8.27311C7.38815 7.72296 7.79212 6.90866 7.79212 6C7.79212 5.09134 7.38815 4.27704 6.75 3.72689C7.06722 3.58122 7.42019 3.5 7.79212 3.5C9.17283 3.5 10.2921 4.61929 10.2921 6C10.2921 7.38071 9.17283 8.5 7.79212 8.5C7.42019 8.5 7.06723 8.41878 6.75 8.27311Z'\n        fill='currentColor'\n      />\n      <circle cx='4.25' cy='6' r='2.5' fill='currentColor' />\n    </svg>\n  );\n};\n\nexport type AttentionGlyphProps = {\n  presence?: 'none' | 'one' | 'many';\n} & ThemedClassName<Omit<ComponentPropsWithRef<typeof Primitive.span>, 'children'>>;\n\nexport const AttentionGlyph = forwardRef<HTMLSpanElement, AttentionGlyphProps>(\n  ({ presence, classNames, ...props }, forwardedRef) => {\n    return (\n      <span role='none' {...props} className={mx(attentionGlyphStyles, classNames)} ref={forwardedRef}>\n        {presence === 'many' && <PresenceMany />}\n        {presence === 'one' && <PresenceOne />}\n      </span>\n    );\n  },\n);\n", "//\n// Copyright 2024 DXOS.org\n//\n\n// NOTE(thure): The following unused imports quell TS2742 (“likely not portable”).\n\n// eslint-disable-next-line unused-imports/no-unused-imports\nimport { createContext, type Scope, type CreateScope } from '@radix-ui/react-context';\nimport React, { useMemo, type FocusEvent, type PropsWithChildren } from 'react';\n\nimport { create } from '@dxos/echo-schema';\nimport { useDefaultValue } from '@dxos/react-ui';\n\nconst ATTENTION_NAME = 'Attention';\nconst ATTENABLE_ATTRIBUTE = 'data-attendable-id';\nconst ATTENTION_SOURCE_ATTRIBUTE = 'data-is-attention-source';\n\ntype Attention = {\n  attended: string[];\n};\n\ntype AttentionContextValue = {\n  attention: Attention;\n  path: string[];\n};\n\nconst [AttentionContextProvider, useAttentionContext] = createContext<AttentionContextValue>(ATTENTION_NAME, {\n  attention: { attended: [] },\n  path: [],\n});\n\ntype UseAttention = {\n  hasAttention: boolean;\n  isAncestor: boolean;\n  isRelated: boolean;\n};\n\nconst useAttention = (attendableId?: string): UseAttention => {\n  const { attention, path } = useAttentionContext(ATTENTION_NAME);\n  if (!attendableId) {\n    return { hasAttention: false, isAncestor: false, isRelated: false };\n  }\n\n  const current = [attendableId, ...path];\n  const hasAttention =\n    current.length === attention.attended.length && current.every((id, index) => attention.attended[index] === id);\n\n  const isAncestor =\n    current.length < attention.attended.length &&\n    attention.attended.slice(-current.length).every((id, index) => current[index] === id);\n\n  const isRelated = attendableId === attention.attended[0];\n\n  return { hasAttention, isAncestor, isRelated };\n};\n\nconst useAttended = () => {\n  const { attention } = useAttentionContext(ATTENTION_NAME);\n  return attention.attended;\n};\n\n/**\n * Computes HTML element attributes to apply so the attention system can detect changes\n * @param attendableId\n */\nconst useAttendableAttributes = (attendableId?: string) => {\n  const { hasAttention } = useAttention(attendableId);\n\n  return useMemo(() => {\n    const attributes: Record<string, string | undefined> = { [ATTENABLE_ATTRIBUTE]: attendableId };\n\n    if (hasAttention) {\n      attributes[ATTENTION_SOURCE_ATTRIBUTE] = 'true';\n    }\n\n    return attributes;\n  }, [attendableId, hasAttention]);\n};\n\nconst useAttentionPath = () => {\n  const { path } = useAttentionContext(ATTENTION_NAME);\n  return path;\n};\n\n/**\n * Accumulates all attendable id’s between the element provided and the root, inclusive.\n */\nconst getAttendables = (selector: string, cursor: Element, acc: string[] = []): string[] => {\n  // Find the closest element with `data-attendable-id`, if any; start from cursor and move up the DOM tree.\n  const closestAttendable = cursor.closest(selector);\n  if (!closestAttendable) {\n    return acc;\n  } else {\n    const attendableId = closestAttendable.getAttribute('data-attendable-id');\n    if (!attendableId) {\n      // this has an id of an aria-controls elsewhere on the page, move cursor to that trigger\n      const trigger = document.querySelector(`[aria-controls=\"${closestAttendable.getAttribute('id')}\"]`);\n      if (!trigger) {\n        return acc;\n      } else {\n        return getAttendables(selector, trigger, acc);\n      }\n    } else {\n      acc.push(attendableId);\n      // (attempt tail recursion)\n      return !closestAttendable.parentElement ? acc : getAttendables(selector, closestAttendable.parentElement, acc);\n    }\n  }\n};\n\nconst RootAttentionProvider = ({\n  children,\n  attention: propsAttention,\n  onChange,\n}: PropsWithChildren<\n  Partial<{\n    attention: Attention;\n    onChange: (nextAttended: string[]) => void;\n  }>\n>) => {\n  const attention = useDefaultValue(propsAttention, () => create<Attention>({ attended: [] }));\n  const handleFocus = (event: FocusEvent) => {\n    const selector = [\n      '[data-attendable-id]',\n      ...Array.from(document.querySelectorAll('[aria-controls]')).map(\n        (el) => `[id=\"${el.getAttribute('aria-controls')}\"]`,\n      ),\n    ].join(',');\n    const prev = attention.attended;\n    const next = Array.from(new Set(getAttendables(selector, event.target)));\n    // TODO(wittjosiah): Not allowing empty state means that the attended item is not strictly guaranteed to be in the DOM.\n    //   Currently this depends on the deck in order to ensure that when the attended item is removed something else is attended.\n    // Only update state if the result is different and not empty.\n    if (next.length > 0 && (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id))) {\n      attention.attended = next;\n      onChange?.(next);\n    }\n  };\n  return (\n    <AttentionContextProvider attention={attention} path={[]}>\n      <div role='none' className='contents' onFocusCapture={handleFocus}>\n        {children}\n      </div>\n    </AttentionContextProvider>\n  );\n};\n\nconst AttentionProvider = ({ id, children }: PropsWithChildren<{ id: string }>) => {\n  const { attention, path } = useAttentionContext(ATTENTION_NAME);\n  const nextPath = useMemo(() => [id, ...path], [id, path]);\n\n  return (\n    <AttentionContextProvider attention={attention} path={nextPath}>\n      {children}\n    </AttentionContextProvider>\n  );\n};\n\nexport {\n  RootAttentionProvider,\n  AttentionProvider,\n  useAttentionContext,\n  useAttention,\n  useAttended,\n  useAttendableAttributes,\n  useAttentionPath,\n  ATTENTION_NAME,\n  ATTENABLE_ATTRIBUTE,\n  ATTENTION_SOURCE_ATTRIBUTE,\n};\n\nexport type { Attention, AttentionContextValue };\n"],
+  "mappings": "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",
+  "names": ["React", "forwardRef", "mx", "attentionGlyphStyles", "presenceIconStyles", "PresenceOne", "svg", "width", "height", "viewBox", "className", "fill", "xmlns", "circle", "cx", "cy", "r", "PresenceMany", "path", "d", "AttentionGlyph", "forwardRef", "presence", "classNames", "props", "forwardedRef", "span", "role", "mx", "ref", "createContext", "React", "useMemo", "create", "useDefaultValue", "ATTENTION_NAME", "ATTENABLE_ATTRIBUTE", "ATTENTION_SOURCE_ATTRIBUTE", "AttentionContextProvider", "useAttentionContext", "createContext", "attention", "attended", "path", "useAttention", "attendableId", "hasAttention", "isAncestor", "isRelated", "current", "length", "every", "id", "index", "slice", "useAttended", "useAttendableAttributes", "useMemo", "attributes", "useAttentionPath", "getAttendables", "selector", "cursor", "acc", "closestAttendable", "closest", "getAttribute", "trigger", "document", "querySelector", "push", "parentElement", "RootAttentionProvider", "children", "propsAttention", "onChange", "useDefaultValue", "create", "handleFocus", "event", "Array", "from", "querySelectorAll", "map", "el", "join", "prev", "next", "Set", "target", "find", "React", "div", "role", "className", "onFocusCapture", "AttentionProvider", "nextPath"]
 }

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx":{"bytes":7599,"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx":{"bytes":12937,"imports":[{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-attention/src/components/index.ts":{"bytes":644,"imports":[{"path":"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx","kind":"import-statement","original":"./AttentionGlyph"},{"path":"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx","kind":"import-statement","original":"./AttentionProvider"}],"format":"esm"},"packages/ui/react-ui-attention/src/index.ts":{"bytes":508,"imports":[{"path":"packages/ui/react-ui-attention/src/components/index.ts","kind":"import-statement","original":"./components"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-attention/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":10378},"packages/ui/react-ui-attention/dist/lib/browser/index.mjs":{"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"exports":["ATTENTION_NAME","AttentionGlyph","AttentionProvider","createAttendableAttributes","useAttentionContext","useHasAttention","useIsDirectlyAttended"],"entryPoint":"packages/ui/react-ui-attention/src/index.ts","inputs":{"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx":{"bytesInOutput":2349},"packages/ui/react-ui-attention/src/components/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx":{"bytesInOutput":2533},"packages/ui/react-ui-attention/src/index.ts":{"bytesInOutput":0}},"bytes":5222}}}
+{"inputs":{"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx":{"bytes":7599,"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx":{"bytes":18367,"imports":[{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-attention/src/components/index.ts":{"bytes":644,"imports":[{"path":"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx","kind":"import-statement","original":"./AttentionGlyph"},{"path":"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx","kind":"import-statement","original":"./AttentionProvider"}],"format":"esm"},"packages/ui/react-ui-attention/src/index.ts":{"bytes":508,"imports":[{"path":"packages/ui/react-ui-attention/src/components/index.ts","kind":"import-statement","original":"./components"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-attention/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":13037},"packages/ui/react-ui-attention/dist/lib/browser/index.mjs":{"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui-theme","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true}],"exports":["ATTENABLE_ATTRIBUTE","ATTENTION_NAME","ATTENTION_SOURCE_ATTRIBUTE","AttentionGlyph","AttentionProvider","RootAttentionProvider","useAttendableAttributes","useAttended","useAttention","useAttentionContext","useAttentionPath"],"entryPoint":"packages/ui/react-ui-attention/src/index.ts","inputs":{"packages/ui/react-ui-attention/src/components/AttentionGlyph.tsx":{"bytesInOutput":2349},"packages/ui/react-ui-attention/src/components/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-attention/src/components/AttentionProvider.tsx":{"bytesInOutput":3703},"packages/ui/react-ui-attention/src/index.ts":{"bytesInOutput":0}},"bytes":6474}}}

package/dist/types/src/components/AttentionProvider.d.ts

@@ -1,23 +1,35 @@
 import React, { type PropsWithChildren } from 'react';
 declare const ATTENTION_NAME = "Attention";
+declare const ATTENABLE_ATTRIBUTE = "data-attendable-id";
+declare const ATTENTION_SOURCE_ATTRIBUTE = "data-is-attention-source";
+type Attention = {
+    attended: string[];
+};
 type AttentionContextValue = {
-    attended: Set<string>;
+    attention: Attention;
+    path: string[];
 };
 declare const useAttentionContext: (consumerName: string) => AttentionContextValue;
-declare const useHasAttention: (attendableId?: string) => boolean;
-declare const useIsDirectlyAttended: (attendableId?: string) => boolean;
+type UseAttention = {
+    hasAttention: boolean;
+    isAncestor: boolean;
+    isRelated: boolean;
+};
+declare const useAttention: (attendableId?: string) => UseAttention;
+declare const useAttended: () => string[];
 /**
  * Computes HTML element attributes to apply so the attention system can detect changes
  * @param attendableId
  */
-declare const createAttendableAttributes: (attendableId?: string) => {
-    'data-attendable-id': string | undefined;
-};
-declare const AttentionProvider: ({ children, attended: propsAttended, defaultAttended, onChangeAttend, }: PropsWithChildren<Partial<{
-    attended: Set<string>;
-    onChangeAttend: (nextAttended: Set<string>) => void;
-    defaultAttended: Set<string>;
+declare const useAttendableAttributes: (attendableId?: string) => Record<string, string | undefined>;
+declare const useAttentionPath: () => string[];
+declare const RootAttentionProvider: ({ children, attention: propsAttention, onChange, }: PropsWithChildren<Partial<{
+    attention: Attention;
+    onChange: (nextAttended: string[]) => void;
 }>>) => React.JSX.Element;
-export { AttentionProvider, useAttentionContext, useHasAttention, useIsDirectlyAttended, createAttendableAttributes, ATTENTION_NAME, };
-export type { AttentionContextValue };
+declare const AttentionProvider: ({ id, children }: PropsWithChildren<{
+    id: string;
+}>) => React.JSX.Element;
+export { RootAttentionProvider, AttentionProvider, useAttentionContext, useAttention, useAttended, useAttendableAttributes, useAttentionPath, ATTENTION_NAME, ATTENABLE_ATTRIBUTE, ATTENTION_SOURCE_ATTRIBUTE, };
+export type { Attention, AttentionContextValue };
 //# sourceMappingURL=AttentionProvider.d.ts.map

package/dist/types/src/components/AttentionProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AttentionProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/AttentionProvider.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,EAAwD,KAAK,iBAAiB,EAAY,MAAM,OAAO,CAAC;AAEtH,QAAA,MAAM,cAAc,cAAc,CAAC;AAEnC,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,QAAA,MAAiC,mBAAmB,iDAElD,CAAC;AAEH,QAAA,MAAM,eAAe,kBAAmB,MAAM,YAG7C,CAAC;AAEF,QAAA,MAAM,qBAAqB,kBAAmB,MAAM,YAInD,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,0BAA0B,kBAAmB,MAAM;;CAExD,CAAC;AA4BF,QAAA,MAAM,iBAAiB,4EAKpB,iBAAiB,CAClB,OAAO,CAAC;IACN,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACtB,cAAc,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACpD,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC9B,CAAC,CACH,sBAyBA,CAAC;AAEF,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,0BAA0B,EAC1B,cAAc,GACf,CAAC;AAEF,YAAY,EAAE,qBAAqB,EAAE,CAAC"}
+{"version":3,"file":"AttentionProvider.d.ts","sourceRoot":"","sources":["../../../../src/components/AttentionProvider.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,EAA4B,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAKhF,QAAA,MAAM,cAAc,cAAc,CAAC;AACnC,QAAA,MAAM,mBAAmB,uBAAuB,CAAC;AACjD,QAAA,MAAM,0BAA0B,6BAA6B,CAAC;AAE9D,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC;AAEF,QAAA,MAAiC,mBAAmB,iDAGlD,CAAC;AAEH,KAAK,YAAY,GAAG;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,QAAA,MAAM,YAAY,kBAAmB,MAAM,KAAG,YAiB7C,CAAC;AAEF,QAAA,MAAM,WAAW,gBAGhB,CAAC;AAEF;;;GAGG;AACH,QAAA,MAAM,uBAAuB,kBAAmB,MAAM,uCAYrD,CAAC;AAEF,QAAA,MAAM,gBAAgB,gBAGrB,CAAC;AA4BF,QAAA,MAAM,qBAAqB,uDAIxB,iBAAiB,CAClB,OAAO,CAAC;IACN,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;CAC5C,CAAC,CACH,sBA0BA,CAAC;AAEF,QAAA,MAAM,iBAAiB,qBAAsB,iBAAiB,CAAC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC,sBAS7E,CAAC;AAEF,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EACnB,0BAA0B,GAC3B,CAAC;AAEF,YAAY,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-attention",
-  "version": "0.6.12-main.5cc132e",
+  "version": "0.6.12-main.89e9959",
   "description": "Signifier components and providers for attention system.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -28,9 +28,10 @@
     "@radix-ui/react-primitive": "^1.0.2",
     "@radix-ui/react-slot": "^1.0.1",
     "@radix-ui/react-use-controllable-state": "^1.0.0",
-    "@dxos/react-ui": "0.6.12-main.5cc132e",
-    "@dxos/util": "0.6.12-main.5cc132e",
-    "@dxos/react-ui-theme": "0.6.12-main.5cc132e"
+    "@dxos/echo-schema": "0.6.12-main.89e9959",
+    "@dxos/react-ui": "0.6.12-main.89e9959",
+    "@dxos/react-ui-theme": "0.6.12-main.89e9959",
+    "@dxos/util": "0.6.12-main.89e9959"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -39,14 +40,14 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/app-graph": "0.6.12-main.5cc132e",
-    "@dxos/storybook-utils": "0.6.12-main.5cc132e",
-    "@dxos/random": "0.6.12-main.5cc132e"
+    "@dxos/app-graph": "0.6.12-main.89e9959",
+    "@dxos/random": "0.6.12-main.89e9959",
+    "@dxos/storybook-utils": "0.6.12-main.89e9959"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/components/AttentionProvider.tsx

@@ -6,37 +6,80 @@
 
 // eslint-disable-next-line unused-imports/no-unused-imports
 import { createContext, type Scope, type CreateScope } from '@radix-ui/react-context';
-import { useControllableState } from '@radix-ui/react-use-controllable-state';
-// eslint-disable-next-line unused-imports/no-unused-imports
-import React, { ComponentProps, type FocusEvent, type HTMLAttributes, type PropsWithChildren, useState } from 'react';
+import React, { useMemo, type FocusEvent, type PropsWithChildren } from 'react';
+
+import { create } from '@dxos/echo-schema';
+import { useDefaultValue } from '@dxos/react-ui';
 
 const ATTENTION_NAME = 'Attention';
+const ATTENABLE_ATTRIBUTE = 'data-attendable-id';
+const ATTENTION_SOURCE_ATTRIBUTE = 'data-is-attention-source';
+
+type Attention = {
+  attended: string[];
+};
 
 type AttentionContextValue = {
-  attended: Set<string>;
+  attention: Attention;
+  path: string[];
 };
 
 const [AttentionContextProvider, useAttentionContext] = createContext<AttentionContextValue>(ATTENTION_NAME, {
-  attended: new Set(),
+  attention: { attended: [] },
+  path: [],
 });
 
-const useHasAttention = (attendableId?: string) => {
-  const { attended } = useAttentionContext(ATTENTION_NAME);
-  return attendableId ? attended.has(attendableId) : false;
+type UseAttention = {
+  hasAttention: boolean;
+  isAncestor: boolean;
+  isRelated: boolean;
+};
+
+const useAttention = (attendableId?: string): UseAttention => {
+  const { attention, path } = useAttentionContext(ATTENTION_NAME);
+  if (!attendableId) {
+    return { hasAttention: false, isAncestor: false, isRelated: false };
+  }
+
+  const current = [attendableId, ...path];
+  const hasAttention =
+    current.length === attention.attended.length && current.every((id, index) => attention.attended[index] === id);
+
+  const isAncestor =
+    current.length < attention.attended.length &&
+    attention.attended.slice(-current.length).every((id, index) => current[index] === id);
+
+  const isRelated = attendableId === attention.attended[0];
+
+  return { hasAttention, isAncestor, isRelated };
 };
 
-const useIsDirectlyAttended = (attendableId?: string) => {
-  const { attended } = useAttentionContext(ATTENTION_NAME);
-  const attendedArray = Array.from(attended);
-  return attendedArray.length === 1 && attendedArray[0] === attendableId;
+const useAttended = () => {
+  const { attention } = useAttentionContext(ATTENTION_NAME);
+  return attention.attended;
 };
 
 /**
  * Computes HTML element attributes to apply so the attention system can detect changes
  * @param attendableId
  */
-const createAttendableAttributes = (attendableId?: string) => {
-  return { 'data-attendable-id': attendableId };
+const useAttendableAttributes = (attendableId?: string) => {
+  const { hasAttention } = useAttention(attendableId);
+
+  return useMemo(() => {
+    const attributes: Record<string, string | undefined> = { [ATTENABLE_ATTRIBUTE]: attendableId };
+
+    if (hasAttention) {
+      attributes[ATTENTION_SOURCE_ATTRIBUTE] = 'true';
+    }
+
+    return attributes;
+  }, [attendableId, hasAttention]);
+};
+
+const useAttentionPath = () => {
+  const { path } = useAttentionContext(ATTENTION_NAME);
+  return path;
 };
 
 /**
@@ -65,23 +108,17 @@ const getAttendables = (selector: string, cursor: Element, acc: string[] = []):
   }
 };
 
-const AttentionProvider = ({
+const RootAttentionProvider = ({
   children,
-  attended: propsAttended,
-  defaultAttended,
-  onChangeAttend,
+  attention: propsAttention,
+  onChange,
 }: PropsWithChildren<
   Partial<{
-    attended: Set<string>;
-    onChangeAttend: (nextAttended: Set<string>) => void;
-    defaultAttended: Set<string>;
+    attention: Attention;
+    onChange: (nextAttended: string[]) => void;
   }>
 >) => {
-  const [attended = new Set(), setAttended] = useControllableState<Set<string>>({
-    prop: propsAttended,
-    defaultProp: defaultAttended,
-    onChange: onChangeAttend,
-  });
+  const attention = useDefaultValue(propsAttention, () => create<Attention>({ attended: [] }));
   const handleFocus = (event: FocusEvent) => {
     const selector = [
       '[data-attendable-id]',
@@ -89,13 +126,18 @@ const AttentionProvider = ({
         (el) => `[id="${el.getAttribute('aria-controls')}"]`,
       ),
     ].join(',');
-    const nextAttended = new Set(getAttendables(selector, event.target));
-    const [prev, next] = [Array.from(attended), Array.from(nextAttended)];
-    // Only update state if the result is different.
-    (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id)) && setAttended(nextAttended);
+    const prev = attention.attended;
+    const next = Array.from(new Set(getAttendables(selector, event.target)));
+    // TODO(wittjosiah): Not allowing empty state means that the attended item is not strictly guaranteed to be in the DOM.
+    //   Currently this depends on the deck in order to ensure that when the attended item is removed something else is attended.
+    // Only update state if the result is different and not empty.
+    if (next.length > 0 && (prev.length !== next.length || !!prev.find((id, index) => next[index] !== id))) {
+      attention.attended = next;
+      onChange?.(next);
+    }
   };
   return (
-    <AttentionContextProvider attended={attended}>
+    <AttentionContextProvider attention={attention} path={[]}>
       <div role='none' className='contents' onFocusCapture={handleFocus}>
         {children}
       </div>
@@ -103,13 +145,28 @@ const AttentionProvider = ({
   );
 };
 
+const AttentionProvider = ({ id, children }: PropsWithChildren<{ id: string }>) => {
+  const { attention, path } = useAttentionContext(ATTENTION_NAME);
+  const nextPath = useMemo(() => [id, ...path], [id, path]);
+
+  return (
+    <AttentionContextProvider attention={attention} path={nextPath}>
+      {children}
+    </AttentionContextProvider>
+  );
+};
+
 export {
+  RootAttentionProvider,
   AttentionProvider,
   useAttentionContext,
-  useHasAttention,
-  useIsDirectlyAttended,
-  createAttendableAttributes,
+  useAttention,
+  useAttended,
+  useAttendableAttributes,
+  useAttentionPath,
   ATTENTION_NAME,
+  ATTENABLE_ATTRIBUTE,
+  ATTENTION_SOURCE_ATTRIBUTE,
 };
 
-export type { AttentionContextValue };
+export type { Attention, AttentionContextValue };