@dxos/app-framework 0.5.2-next.51d50f2 → 0.5.3-main.056e7da

package/dist/types/src/plugins/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,YAAY,6DAAsE,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,UAAU,eAAgB,MAAM,EAAE,MAAM,MAAM,0BAI1D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,eAAgB,MAAM,EAAE,MAAM,MAAM,cAEzD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,eACf,MAAM,EAAE,sBACG,MAAM,0CACkF,CAAC;AAE/G;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eACf,MAAM,EAAE,sBACG,MAAM,oDACoC,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/plugins/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,YAAY,sBAAuB,OAAO,SAAS,CAAC,KAAG,OAAO,SAAS,CAAW,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,UAAU,eAAgB,MAAM,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,SAIzE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,eAAgB,MAAM,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,CAEpE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,eACf,MAAM,EAAE,aACN,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,KACnD,OAAO,CAAC,CAAC,EAAkG,CAAC;AAE/G;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,eACf,MAAM,EAAE,aACN,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,KACnD,OAAO,CAAC,CAAC,GAAG,SAAiD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.5.2-next.51d50f2",
+  "version": "0.5.3-main.056e7da",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -15,14 +15,14 @@
     "@phosphor-icons/react": "^2.1.5",
     "@preact/signals-core": "^1.6.0",
     "zod": "^3.22.4",
-    "@dxos/app-graph": "0.5.2-next.51d50f2",
-    "@dxos/debug": "0.5.2-next.51d50f2",
-    "@dxos/echo-schema": "0.5.2-next.51d50f2",
-    "@dxos/invariant": "0.5.2-next.51d50f2",
-    "@dxos/async": "0.5.2-next.51d50f2",
-    "@dxos/log": "0.5.2-next.51d50f2",
-    "@dxos/util": "0.5.2-next.51d50f2",
-    "@dxos/local-storage": "0.5.2-next.51d50f2"
+    "@dxos/app-graph": "0.5.3-main.056e7da",
+    "@dxos/async": "0.5.3-main.056e7da",
+    "@dxos/echo-schema": "0.5.3-main.056e7da",
+    "@dxos/invariant": "0.5.3-main.056e7da",
+    "@dxos/debug": "0.5.3-main.056e7da",
+    "@dxos/local-storage": "0.5.3-main.056e7da",
+    "@dxos/util": "0.5.3-main.056e7da",
+    "@dxos/log": "0.5.3-main.056e7da"
   },
   "devDependencies": {
     "@types/react": "^18.0.21",

package/src/plugins/SurfacePlugin/ErrorBoundary.tsx

@@ -4,7 +4,7 @@
 
 import React, { Component, type FC, type PropsWithChildren } from 'react';
 
-type Props = PropsWithChildren<{ data?: any; fallback: FC<{ error: Error; reset: () => void }> }>;
+type Props = PropsWithChildren<{ data?: any; fallback: FC<{ data?: any; error: Error; reset: () => void }> }>;
 type State = { error: Error | undefined };
 
 /**
@@ -33,7 +33,7 @@ export class ErrorBoundary extends Component<Props, State> {
 
   override render() {
     if (this.state.error) {
-      return <this.props.fallback error={this.state.error} reset={this.resetError} />;
+      return <this.props.fallback data={this.props.data} error={this.state.error} reset={this.resetError} />;
     }
 
     return this.props.children;

package/src/plugins/common/layout.ts

@@ -57,6 +57,11 @@ export const Layout = z.object({
   popoverAnchorId: z.string().optional(),
 
   toasts: z.array(Toast),
+
+  scrollIntoView: z
+    .string()
+    .optional()
+    .describe('The identifier of a component to scroll into view when it is mounted.'),
 });
 
 export type Layout = z.infer<typeof Layout>;
@@ -83,11 +88,7 @@ export const parseLayoutPlugin = (plugin: Plugin) => {
 const LAYOUT_ACTION = 'dxos.org/plugin/layout';
 export enum LayoutAction {
   SET_LAYOUT = `${LAYOUT_ACTION}/set-layout`,
-
-  /** @deprecated */
-  // TODO(wittjosiah): At minimum this should be renamed, "focus" means something very specific on a web page.
-  //   Consider removing this action entirely, it's maybe not generic enough to live here.
-  FOCUS = `${LAYOUT_ACTION}/focus`,
+  SCROLL_INTO_VIEW = `${LAYOUT_ACTION}/scroll-into-view`,
 }
 
 /**

package/src/plugins/common/navigation.ts

@@ -8,7 +8,7 @@ import type { IntentData } from '../IntentPlugin';
 import type { Plugin } from '../PluginHost';
 
 // NOTE(thure): These are chosen from RFC 1738’s `safe` characters: http://www.faqs.org/rfcs/rfc1738.html
-export const SLUG_LIST_SEPARATOR = '.';
+export const SLUG_LIST_SEPARATOR = '+';
 export const SLUG_ENTRY_SEPARATOR = '_';
 export const SLUG_KEY_VALUE_SEPARATOR = '-';
 export const SLUG_PATH_SEPARATOR = '~';
@@ -36,8 +36,14 @@ export const Location = z.object({
     .describe('Id or ids of recently closed items, in order of when they were closed.'),
 });
 
+export const Attention = z.object({
+  attended: z.set(z.string()).optional().describe('Ids of items which have focus.'),
+});
+
 export type ActiveParts = z.infer<typeof ActiveParts>;
 export type Location = z.infer<typeof Location>;
+export type Attention = z.infer<typeof Attention>;
+
 /**
  * Composed of [ part name, index within the part, size of the part ]
  */
@@ -77,6 +83,7 @@ export const isIdActive = (active: string | ActiveParts | undefined, id: string)
  */
 export type LocationProvides = {
   location: Readonly<Location>;
+  attention?: Readonly<Attention>;
 };
 
 /**
@@ -94,6 +101,7 @@ export const parseNavigationPlugin = (plugin: Plugin) => {
 const NAVIGATION_ACTION = 'dxos.org/plugin/navigation';
 export enum NavigationAction {
   OPEN = `${NAVIGATION_ACTION}/open`,
+  SET = `${NAVIGATION_ACTION}/set`,
   ADJUST = `${NAVIGATION_ACTION}/adjust`,
   CLOSE = `${NAVIGATION_ACTION}/close`,
 }
@@ -110,6 +118,10 @@ export namespace NavigationAction {
    * A subtractive overlay to apply to `location.active` (i.e. the result is a subtraction from the previous active of the argument)
    */
   export type Close = IntentData<{ activeParts: ActiveParts }>;
+  /**
+   * The active parts to directly set, to be used when working with URLs or restoring a specific state.
+   */
+  export type Set = IntentData<{ activeParts: ActiveParts }>;
   /**
    * An atomic transaction to apply to `location.active`, describing which element to (attempt to) move to which location.
    */