@dxos/plugin-deck 0.6.13 → 0.6.14-main.1366248

package/package.json

@@ -1,19 +1,24 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.6.13",
+  "version": "0.6.14-main.1366248",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
+  "sideEffects": true,
   "exports": {
     ".": {
-      "browser": "./dist/lib/browser/index.mjs",
-      "types": "./dist/types/src/index.d.ts"
+      "types": "./dist/types/src/index.d.ts",
+      "browser": "./dist/lib/browser/index.mjs"
     },
     "./meta": {
-      "browser": "./dist/lib/browser/meta.mjs",
-      "types": "./dist/types/src/meta.d.ts"
+      "types": "./dist/types/src/meta.d.ts",
+      "browser": "./dist/lib/browser/meta.mjs"
+    },
+    "./types": {
+      "types": "./dist/types/src/types.d.ts",
+      "browser": "./dist/lib/browser/types.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -21,6 +26,9 @@
     "*": {
       "meta": [
         "dist/types/src/meta.d.ts"
+      ],
+      "types": [
+        "dist/types/src/types.d.ts"
       ]
     }
   },
@@ -32,26 +40,27 @@
     "@fluentui/react-tabster": "^9.19.0",
     "@preact/signals-core": "^1.6.0",
     "immer": "^10.1.1",
-    "@dxos/app-framework": "0.6.13",
-    "@dxos/async": "0.6.13",
-    "@dxos/echo-schema": "0.6.13",
-    "@dxos/debug": "0.6.13",
-    "@dxos/keyboard": "0.6.13",
-    "@dxos/local-storage": "0.6.13",
-    "@dxos/invariant": "0.6.13",
-    "@dxos/log": "0.6.13",
-    "@dxos/plugin-attention": "0.6.13",
-    "@dxos/plugin-client": "0.6.13",
-    "@dxos/plugin-graph": "0.6.13",
-    "@dxos/plugin-observability": "0.6.13",
-    "@dxos/plugin-settings": "0.6.13",
-    "@dxos/plugin-theme": "0.6.13",
-    "@dxos/react-client": "0.6.13",
-    "@dxos/react-ui-attention": "0.6.13",
-    "@dxos/react-ui-deck": "0.6.13",
-    "@dxos/util": "0.6.13",
-    "@dxos/react-ui-mosaic": "0.6.13",
-    "@dxos/react-ui-text-tooltip": "0.6.13"
+    "@dxos/app-framework": "0.6.14-main.1366248",
+    "@dxos/debug": "0.6.14-main.1366248",
+    "@dxos/echo-schema": "0.6.14-main.1366248",
+    "@dxos/async": "0.6.14-main.1366248",
+    "@dxos/echo-signals": "0.6.14-main.1366248",
+    "@dxos/invariant": "0.6.14-main.1366248",
+    "@dxos/keyboard": "0.6.14-main.1366248",
+    "@dxos/local-storage": "0.6.14-main.1366248",
+    "@dxos/plugin-attention": "0.6.14-main.1366248",
+    "@dxos/log": "0.6.14-main.1366248",
+    "@dxos/plugin-client": "0.6.14-main.1366248",
+    "@dxos/plugin-graph": "0.6.14-main.1366248",
+    "@dxos/plugin-observability": "0.6.14-main.1366248",
+    "@dxos/plugin-theme": "0.6.14-main.1366248",
+    "@dxos/react-client": "0.6.14-main.1366248",
+    "@dxos/react-ui-attention": "0.6.14-main.1366248",
+    "@dxos/react-ui-deck": "0.6.14-main.1366248",
+    "@dxos/react-ui-data": "0.6.14-main.1366248",
+    "@dxos/react-ui-text-tooltip": "0.6.14-main.1366248",
+    "@dxos/util": "0.6.14-main.1366248",
+    "@dxos/react-ui-mosaic": "0.6.14-main.1366248"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -59,17 +68,17 @@
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "^5.3.4",
-    "@dxos/storybook-utils": "0.6.13",
-    "@dxos/react-ui": "0.6.13",
-    "@dxos/react-ui-theme": "0.6.13"
+    "vite": "5.4.7",
+    "@dxos/react-ui": "0.6.14-main.1366248",
+    "@dxos/react-ui-theme": "0.6.14-main.1366248",
+    "@dxos/storybook-utils": "0.6.14-main.1366248"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.0.5",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "@dxos/react-ui": "0.6.13",
-    "@dxos/react-ui-theme": "0.6.13"
+    "react": "~18.2.0",
+    "react-dom": "~18.2.0",
+    "@dxos/react-ui": "0.6.14-main.1366248",
+    "@dxos/react-ui-theme": "0.6.14-main.1366248"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.tsx

@@ -2,8 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { ArrowsOut, type IconProps } from '@phosphor-icons/react';
-import { batch, effect } from '@preact/signals-core';
+import { batch } from '@preact/signals-core';
 import { setAutoFreeze } from 'immer';
 import React, { type PropsWithChildren } from 'react';
 
@@ -30,9 +29,11 @@ import {
   openIds,
   type LayoutMode,
   type IntentData,
+  filterPlugins,
 } from '@dxos/app-framework';
 import { type UnsubscribeCallback } from '@dxos/async';
 import { create, getTypename, isReactiveObject } from '@dxos/echo-schema';
+import { scheduledEffect } from '@dxos/echo-signals/core';
 import { LocalStorageStore } from '@dxos/local-storage';
 import { log } from '@dxos/log';
 import { parseAttentionPlugin, type AttentionPluginProvides } from '@dxos/plugin-attention';
@@ -41,7 +42,6 @@ import { createExtension, type Node } from '@dxos/plugin-graph';
 import { ObservabilityAction } from '@dxos/plugin-observability/meta';
 import { fullyQualifiedId } from '@dxos/react-client/echo';
 import { translations as deckTranslations } from '@dxos/react-ui-deck';
-import { Mosaic } from '@dxos/react-ui-mosaic';
 
 import {
   DeckLayout,
@@ -63,7 +63,14 @@ import {
 } from './layout';
 import meta, { DECK_PLUGIN } from './meta';
 import translations from './translations';
-import { type NewPlankPositioning, type DeckPluginProvides, type DeckSettingsProps, type Overscroll } from './types';
+import {
+  type NewPlankPositioning,
+  type DeckPluginProvides,
+  type DeckSettingsProps,
+  type Overscroll,
+  type Panel,
+  parsePanelPlugin,
+} from './types';
 import { checkAppScheme, getEffectivePart } from './util';
 
 const isSocket = !!(globalThis as any).__args;
@@ -71,7 +78,7 @@ const isSocket = !!(globalThis as any).__args;
 // TODO(mjamesderocher): Can we get this directly from Socket?
 const appScheme = 'composer://';
 
-// TODO(burdon): Evolve into customizable prefs,.
+// TODO(burdon): Evolve into customizable prefs.
 const customSlots: DeckLayoutProps['slots'] = {
   wallpaper: {
     classNames:
@@ -110,9 +117,10 @@ export const DeckPlugin = ({
   const unsubscriptionCallbacks = [] as (UnsubscribeCallback | undefined)[];
   let currentUndoId: string | undefined;
   let handleNavigation: () => Promise<void> | undefined;
+  const panels: Panel[] = [];
 
   const settings = new LocalStorageStore<DeckSettingsProps>('dxos.org/settings/layout', {
-    showFooter: false,
+    showHints: false,
     customSlots: false,
     flatDeck: false,
     enableNativeRedirect: false,
@@ -190,6 +198,28 @@ export const DeckPlugin = ({
     }
   };
 
+  /**
+   * Update the active state and ensure that attention is on an active element.
+   */
+  const handleSetLocation = (next: LayoutParts) => {
+    if (attentionPlugin) {
+      const attended = attentionPlugin.provides.attention.attended;
+      const [attendedId] = Array.from(attended);
+      const ids = (layout.values.layoutMode === 'deck' ? next.main : next.solo)?.map(({ id }) => id) ?? [];
+      const isAttendedAvailable = !!attendedId && ids.includes(attendedId);
+      if (!isAttendedAvailable) {
+        // Allow new plank to render before focusing.
+        requestAnimationFrame(() => {
+          const nextAttended = layout.values.layoutMode === 'solo' ? next.solo?.[0].id : next.main?.[0]?.id;
+          const article = document.querySelector<HTMLElement>(`article[data-attendable-id="${nextAttended}"]`);
+          article?.focus();
+        });
+      }
+    }
+
+    location.values.active = next;
+  };
+
   return {
     meta,
     ready: async (plugins) => {
@@ -198,19 +228,20 @@ export const DeckPlugin = ({
       attentionPlugin = resolvePlugin(plugins, parseAttentionPlugin);
       clientPlugin = resolvePlugin(plugins, parseClientPlugin);
 
-      // prettier-ignore
       layout
-        .prop({ key: 'layoutMode', storageKey: 'layout-mode', type: LocalStorageStore.enum<LayoutMode>() })
-        .prop({ key: 'sidebarOpen', storageKey: 'sidebar-open', type: LocalStorageStore.bool() })
-        .prop({ key: 'complementarySidebarOpen', storageKey: 'complementary-sidebar-open', type: LocalStorageStore.bool() });
+        .prop({ key: 'layoutMode', type: LocalStorageStore.enum<LayoutMode>() })
+        .prop({ key: 'sidebarOpen', type: LocalStorageStore.bool() })
+        .prop({ key: 'complementarySidebarOpen', type: LocalStorageStore.bool() });
 
-      // prettier-ignore
-      deck.prop({ key: 'plankSizing', storageKey: 'plank-sizing', type: LocalStorageStore.json<Record<string, number>>() });
+      deck.prop({ key: 'plankSizing', type: LocalStorageStore.json<Record<string, number>>() });
 
-      // prettier-ignore
       location
-        .prop({ key: 'active', storageKey: 'active', type: LocalStorageStore.json<LayoutParts>() })
-        .prop({ key: 'closed', storageKey: 'closed', type: LocalStorageStore.json<string[]>() });
+        .prop({ key: 'active', type: LocalStorageStore.json<LayoutParts>() })
+        .prop({ key: 'closed', type: LocalStorageStore.json<string[]>() });
+
+      panels.push(
+        ...filterPlugins(plugins, parsePanelPlugin).flatMap((plugin) => plugin.provides.complementary.panels),
+      );
 
       unsubscriptionCallbacks.push(
         clientPlugin?.provides.client.shell.onReset(() => {
@@ -220,15 +251,14 @@ export const DeckPlugin = ({
         }),
       );
 
-      // prettier-ignore
       settings
-        .prop({ key: 'showFooter', storageKey: 'show-footer', type: LocalStorageStore.bool() })
-        .prop({ key: 'customSlots', storageKey: 'customSlots', type: LocalStorageStore.bool() })
-        .prop({ key: 'flatDeck', storageKey: 'flatDeck', type: LocalStorageStore.bool() })
-        .prop({ key: 'enableNativeRedirect', storageKey: 'enable-native-redirect', type: LocalStorageStore.bool() })
-        .prop({ key: 'disableDeck', storageKey: 'disable-deck', type: LocalStorageStore.bool() }) // Deprecated.
-        .prop({ key: 'newPlankPositioning', storageKey: 'newPlankPositioning', type: LocalStorageStore.enum<NewPlankPositioning>() })
-        .prop({ key: 'overscroll', storageKey: 'overscroll', type: LocalStorageStore.enum<Overscroll>() });
+        .prop({ key: 'showHints', type: LocalStorageStore.bool() })
+        .prop({ key: 'customSlots', type: LocalStorageStore.bool() })
+        .prop({ key: 'flatDeck', type: LocalStorageStore.bool() })
+        .prop({ key: 'enableNativeRedirect', type: LocalStorageStore.bool() })
+        .prop({ key: 'disableDeck', type: LocalStorageStore.bool() }) // Deprecated.
+        .prop({ key: 'newPlankPositioning', type: LocalStorageStore.enum<NewPlankPositioning>() })
+        .prop({ key: 'overscroll', type: LocalStorageStore.enum<Overscroll>() });
 
       if (!isSocket && settings.values.enableNativeRedirect) {
         checkAppScheme(appScheme);
@@ -237,7 +267,7 @@ export const DeckPlugin = ({
       handleNavigation = async () => {
         const pathname = window.location.pathname;
         if (pathname === '/reset') {
-          location.values.active = { sidebar: [{ id: NAV_ID }] };
+          handleSetLocation({ sidebar: [{ id: NAV_ID }] });
           location.values.closed = [];
           layout.values.layoutMode = 'solo';
           window.location.pathname = '/';
@@ -250,7 +280,7 @@ export const DeckPlugin = ({
         }
 
         const startingLayout = removePart(location.values.active, 'solo');
-        location.values.active = mergeLayoutParts(layoutFromUri, startingLayout);
+        handleSetLocation(mergeLayoutParts(layoutFromUri, startingLayout));
         layout.values.layoutMode = 'solo';
       };
 
@@ -258,23 +288,13 @@ export const DeckPlugin = ({
       window.addEventListener('popstate', handleNavigation);
 
       unsubscriptionCallbacks.push(
-        effect(() => {
-          const selectedPath = soloPartToUri(location.values.active);
-          // TODO(thure): In some browsers, this only preserves the most recent state change, even though this is not `history.replace`…
-          history.pushState(null, '', `/${selectedPath}${window.location.search}`);
-        }),
-      );
-
-      unsubscriptionCallbacks.push(
-        effect(() => {
-          const soloId = location.values.active.solo?.[0].id;
-          if (layout.values.layoutMode === 'solo' && soloId && layout.values.scrollIntoView !== soloId) {
-            void intentPlugin?.provides.intent.dispatch({
-              action: LayoutAction.SCROLL_INTO_VIEW,
-              data: { id: soloId },
-            });
-          }
-        }),
+        scheduledEffect(
+          () => ({ selectedPath: soloPartToUri(location.values.active) }),
+          ({ selectedPath }) => {
+            // TODO(thure): In some browsers, this only preserves the most recent state change, even though this is not `history.replace`…
+            history.pushState(null, '', `/${selectedPath}${window.location.search}`);
+          },
+        ),
       );
 
       layoutModeHistory.values.push(`${layout.values.layoutMode}`);
@@ -310,8 +330,7 @@ export const DeckPlugin = ({
                 },
                 properties: {
                   label: ['toggle fullscreen label', { ns: DECK_PLUGIN }],
-                  icon: (props: IconProps) => <ArrowsOut {...props} />,
-                  iconSymbol: 'ph--arrows-out--regular',
+                  icon: 'ph--arrows-out--regular',
                   keyBinding: {
                     macos: 'ctrl+meta+f',
                     windows: 'shift+ctrl+f',
@@ -329,31 +348,28 @@ export const DeckPlugin = ({
       ),
       root: () => {
         return (
-          <Mosaic.Root>
-            <DeckLayout
-              attention={attentionPlugin?.provides.attention ?? { attended: new Set() }}
-              layoutParts={location.values.active}
-              showHintsFooter={settings.values.showFooter}
-              overscroll={settings.values.overscroll}
-              flatDeck={settings.values.flatDeck}
-              slots={settings.values.customSlots ? customSlots : undefined}
-              toasts={layout.values.toasts}
-              onDismissToast={(id) => {
-                const index = layout.values.toasts.findIndex((toast) => toast.id === id);
-                if (index !== -1) {
-                  // Allow time for the toast to animate out.
-                  // TODO(burdon): Factor out and unregister timeout.
-                  setTimeout(() => {
-                    if (layout.values.toasts[index].id === currentUndoId) {
-                      currentUndoId = undefined;
-                    }
-                    layout.values.toasts.splice(index, 1);
-                  }, 1_000);
-                }
-              }}
-            />
-            <Mosaic.DragOverlay />
-          </Mosaic.Root>
+          <DeckLayout
+            layoutParts={location.values.active}
+            showHints={settings.values.showHints}
+            overscroll={settings.values.overscroll}
+            flatDeck={settings.values.flatDeck}
+            slots={settings.values.customSlots ? customSlots : undefined}
+            toasts={layout.values.toasts}
+            panels={panels}
+            onDismissToast={(id) => {
+              const index = layout.values.toasts.findIndex((toast) => toast.id === id);
+              if (index !== -1) {
+                // Allow time for the toast to animate out.
+                // TODO(burdon): Factor out and unregister timeout.
+                setTimeout(() => {
+                  if (layout.values.toasts[index].id === currentUndoId) {
+                    currentUndoId = undefined;
+                  }
+                  layout.values.toasts.splice(index, 1);
+                }, 1_000);
+              }
+            }}
+          />
         );
       },
       surface: {
@@ -472,7 +488,7 @@ export const DeckPlugin = ({
                   }
                 });
 
-                location.values.active = newLayout;
+                handleSetLocation(newLayout);
               });
 
               const ids = openIds(location.values.active);
@@ -522,10 +538,12 @@ export const DeckPlugin = ({
               const layoutEntry = { id: data.id };
               const effectivePart = getEffectivePart(data.part, layout.values.layoutMode);
 
-              location.values.active = openEntry(location.values.active, effectivePart, layoutEntry, {
-                positioning: data.positioning ?? settings.values.newPlankPositioning,
-                pivotId: data.pivotId,
-              });
+              handleSetLocation(
+                openEntry(location.values.active, effectivePart, layoutEntry, {
+                  positioning: data.positioning ?? settings.values.newPlankPositioning,
+                  pivotId: data.pivotId,
+                }),
+              );
 
               const intents = [];
               if (data.scrollIntoView && layout.values.layoutMode === 'deck') {
@@ -561,7 +579,11 @@ export const DeckPlugin = ({
                   }
                 });
 
-                location.values.active = newLayout;
+                handleSetLocation(newLayout);
+                // TODO(wittjosiah): This needs to also set the closed state.
+                //   The closed state should be the existing closed state plus the newly closed ids.
+                //   The closed state should also be updated when opening entries to remove the id from closed.
+                //   When SET is called the closed ids should also be calculated and set.
                 return { data: true };
               });
             }
@@ -570,7 +592,7 @@ export const DeckPlugin = ({
             case NavigationAction.SET: {
               return batch(() => {
                 if (isLayoutParts(intent.data?.activeParts)) {
-                  location.values.active = intent.data!.activeParts;
+                  handleSetLocation(intent.data!.activeParts);
                 }
                 return { data: true };
               });
@@ -581,10 +603,12 @@ export const DeckPlugin = ({
                 if (isLayoutAdjustment(intent.data)) {
                   const adjustment = intent.data;
                   if (adjustment.type === 'increment-end' || adjustment.type === 'increment-start') {
-                    location.values.active = incrementPlank(location.values.active, {
-                      type: adjustment.type,
-                      layoutCoordinate: adjustment.layoutCoordinate,
-                    });
+                    handleSetLocation(
+                      incrementPlank(location.values.active, {
+                        type: adjustment.type,
+                        layoutCoordinate: adjustment.layoutCoordinate,
+                      }),
+                    );
                   }
 
                   if (adjustment.type === 'solo') {

package/src/components/DeckLayout/ActiveNode.tsx

@@ -6,10 +6,13 @@ import React from 'react';
 
 import { Surface } from '@dxos/app-framework';
 import { useGraph } from '@dxos/plugin-graph';
+import { useAttended } from '@dxos/react-ui-attention';
 
 import { useNode, useNodeActionExpander } from '../../hooks';
 
-export const ActiveNode = ({ id }: { id?: string }) => {
+// TODO(burdon): Factor out to effect in plugin set document title.
+export const ActiveNode = () => {
+  const [id] = useAttended();
   const { graph } = useGraph();
   const activeNode = useNode(graph, id);
   useNodeActionExpander(activeNode);

package/src/components/DeckLayout/ComplementarySidebar.tsx

@@ -2,12 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
-import { type LayoutParts, SLUG_PATH_SEPARATOR, Surface } from '@dxos/app-framework';
+import {
+  type LayoutCoordinate,
+  NavigationAction,
+  SLUG_PATH_SEPARATOR,
+  Surface,
+  useIntentDispatcher,
+} from '@dxos/app-framework';
 import { useGraph } from '@dxos/plugin-graph';
 import { Main } from '@dxos/react-ui';
-import { createAttendableAttributes } from '@dxos/react-ui-attention';
+import { useAttended } from '@dxos/react-ui-attention';
 import { deckGrid } from '@dxos/react-ui-deck';
 import { mx } from '@dxos/react-ui-theme';
 
@@ -15,44 +21,69 @@ import { NodePlankHeading } from './NodePlankHeading';
 import { PlankContentError } from './PlankError';
 import { PlankLoading } from './PlankLoading';
 import { useNode, useNodeActionExpander } from '../../hooks';
+import { type Panel } from '../../types';
 import { useLayout } from '../LayoutContext';
 
 export type ComplementarySidebarProps = {
-  id?: string;
-  layoutParts: LayoutParts;
+  panels: Panel[];
+  current?: string;
   flatDeck?: boolean;
 };
 
-export const ComplementarySidebar = ({ id, layoutParts, flatDeck }: ComplementarySidebarProps) => {
+export const ComplementarySidebar = ({ panels, current, flatDeck }: ComplementarySidebarProps) => {
   const { popoverAnchorId } = useLayout();
+  const attended = useAttended();
+  const panel = (panels.find((p) => p.id === current) ?? panels[0])?.id;
+  const id = attended[0] ? `${attended[0]}${SLUG_PATH_SEPARATOR}${panel}` : undefined;
   const { graph } = useGraph();
   const node = useNode(graph, id);
-  // const complementaryAvailable = useMemo(() => id === NAV_ID || !!node, [id, node]);
-  const complementaryAttrs = createAttendableAttributes(id?.split(SLUG_PATH_SEPARATOR)[0] ?? 'never');
-
+  const dispatch = useIntentDispatcher();
   useNodeActionExpander(node);
 
+  const actions = useMemo(
+    () =>
+      panels.map(({ id, label, icon }) => ({
+        id: `complementary-${id}`,
+        data: () => {
+          void dispatch({ action: NavigationAction.OPEN, data: { activeParts: { complementary: id } } });
+        },
+        properties: {
+          label,
+          icon,
+          menuItemType: 'toggle',
+          isChecked: panel === id,
+        },
+      })),
+    [panel],
+  );
+
+  // TODO(wittjosiah): Ensure that id is always defined.
+  const coordinate: LayoutCoordinate = useMemo(() => ({ entryId: id ?? 'unknown', part: 'complementary' }), [id]);
+
+  // TODO(burdon): Debug panel doesn't change when switching even though id has chagned.
   return (
-    <Main.ComplementarySidebar {...complementaryAttrs}>
-      {node ? (
-        <div role='none' className={mx(deckGrid, 'grid-cols-1 bs-full')}>
-          <NodePlankHeading
-            node={node}
-            id={id}
-            layoutParts={layoutParts}
-            layoutPart='complementary'
-            popoverAnchorId={popoverAnchorId}
-            flatDeck={flatDeck}
-          />
-          <Surface
-            role='article'
-            data={{ subject: node.data, part: 'complementary', popoverAnchorId }}
-            limit={1}
-            fallback={PlankContentError}
-            placeholder={<PlankLoading />}
-          />
+    <Main.ComplementarySidebar>
+      <div role='none' className={mx(deckGrid, 'grid-cols-1 bs-full')}>
+        <NodePlankHeading
+          coordinate={coordinate}
+          node={node}
+          popoverAnchorId={popoverAnchorId}
+          flatDeck={flatDeck}
+          actions={actions}
+        />
+        <div className='row-span-2 divide-y divide-separator overflow-x-hidden overflow-y-scroll'>
+          {node && (
+            <Surface
+              key={id}
+              role={`complementary--${panel}`}
+              limit={1}
+              data={{ id, subject: node.properties.object ?? node.properties.space, popoverAnchorId }}
+              fallback={PlankContentError}
+              placeholder={<PlankLoading />}
+            />
+          )}
         </div>
-      ) : null}
+      </div>
     </Main.ComplementarySidebar>
   );
 };