@dxos/react-ui-editor 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

package/src/stories/Experimental.stories.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { log } from '@dxos/log';
 import { random } from '@dxos/random';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
-import { blast, defaultOptions, dropFile, join, typewriter } from '@dxos/ui-editor';
+import { blast, defaultOptions, dropFile, join, snippets } from '@dxos/ui-editor';
 
 import { EditorStory, content } from './components';
 
@@ -27,16 +27,16 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 //
-// Typewriter
+// Snippets
 //
 
-const typewriterItems = localStorage.getItem('org.dxos.testing.typewriter')?.split(',');
+const snippetItems = localStorage.getItem('org.dxos.testing.snippets')?.split(',');
 
-export const Typewriter: Story = {
+export const Snippets: Story = {
   render: () => (
     <EditorStory
-      text={join('# Typewriter', '', content.paragraphs, content.footer)}
-      extensions={[typewriter({ items: typewriterItems })]}
+      text={join('# Snippets', '', content.paragraphs, content.footer)}
+      extensions={[snippets({ items: snippetItems })]}
     />
   ),
 };
@@ -50,7 +50,7 @@ export const Blast: Story = {
     <EditorStory
       text={join('# Blast', '', content.paragraphs, content.codeblocks, content.paragraphs)}
       extensions={[
-        typewriter({ items: typewriterItems }),
+        snippets({ items: snippetItems }),
         blast(
           defaultsDeep(
             {

package/src/stories/Popover.stories.tsx

@@ -81,7 +81,7 @@ const LinkStory = (args: DefaultStoryProps) => {
             label: object.name,
             icon: 'ph--user--regular',
             onSelect: ({ view, head }) => {
-              const link = `[${object.name}](${Obj.getDXN(object)})`;
+              const link = `[${object.name}](${Obj.getURI(object)})`;
               if (text?.startsWith('@')) {
                 insertAtLineStart(view, head, `!${link}\n`);
               } else {

package/src/stories/Preview.stories.tsx

@@ -59,13 +59,13 @@ const PreviewCard = () => {
       <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
         <Popover.Viewport classNames='dx-card-popover-width'>
           <Card.Root border={false}>
-            <Card.Toolbar>
+            <Card.Header>
               <Card.Icon icon='ph--file-text--regular' />
               <Card.Title>{target.label}</Card.Title>
               <Popover.Close asChild>
-                <Card.CloseIconButton />
+                <Card.ActionIconButton action='close' />
               </Popover.Close>
-            </Card.Toolbar>
+            </Card.Header>
             <Card.Row>
               <Card.Text variant='description'>{target.text}</Card.Text>
             </Card.Row>
@@ -165,7 +165,7 @@ const PreviewBlockComponent = ({ link, el, view }: { link: PreviewLinkRef; el: H
     <Menu.Root>
       <Card.Root classNames={hoverableControls}>
         {!view?.state.readOnly && (
-          <Card.Toolbar>
+          <Card.Header>
             <Card.Icon icon='ph--bookmark--regular' />
             <Card.Title>{link.label}</Card.Title>
             {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
@@ -173,7 +173,7 @@ const PreviewBlockComponent = ({ link, el, view }: { link: PreviewLinkRef; el: H
               <Toolbar.IconButton iconOnly variant='ghost' icon='ph--dots-three-vertical--regular' label='Menu' />
             </Menu.Trigger>
             <Menu.Content items={menuItems} />
-          </Card.Toolbar>
+          </Card.Header>
         )}
         {target && (
           <Card.Row>

package/src/stories/components/util.tsx

@@ -9,7 +9,6 @@ import { random } from '@dxos/random';
 import { Domino } from '@dxos/ui';
 import {
   type EditorSelectionState,
-  type RenderCallback,
   decorateMarkdown,
   folding,
   formattingKeymap,
@@ -17,6 +16,7 @@ import {
   linkTooltip,
   table,
 } from '@dxos/ui-editor';
+import { type RenderCallback } from '@dxos/ui-editor/types';
 import { safeUrl } from '@dxos/util';
 
 import { str } from '../../util';
@@ -206,7 +206,7 @@ export const links: Completion[] = [
 export const names = ['adam', 'alice', 'alison', 'bob', 'carol', 'charlie', 'sayuri', 'shoko'];
 
 const hover =
-  'rounded-xs text-base-surface-text text-primary-600 hover:text-primary-500 dark:text-primary-300 hover:dark:text-primary-200';
+  'rounded-xs text-base-fg text-primary-600 hover:text-primary-500 dark:text-primary-300 hover:dark:text-primary-200';
 
 export const renderLinkTooltip: RenderCallback<{ url: string }> = (el, { url }) => {
   el.appendChild(

package/src/util/react.tsx

@@ -6,8 +6,8 @@ import React, { type FC } from 'react';
 import { createRoot } from 'react-dom/client';
 
 import { ThemeProvider, Tooltip } from '@dxos/react-ui';
-import { type RenderCallback } from '@dxos/ui-editor';
-import { defaultTx } from '@dxos/ui-theme';
+import { defaultTx } from '@dxos/react-ui';
+import { type RenderCallback } from '@dxos/ui-editor/types';
 
 /**
  * @deprecated Use `trim` from `@dxos/util`.