@dxos/plugin-settings 0.6.13 → 0.6.14-main.7bd9c89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-settings",
-  "version": "0.6.13",
+  "version": "0.6.14-main.7bd9c89",
   "description": "DXOS app plugin for aggregating and rendering plugin settings.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,14 +10,16 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "default": "./dist/lib/node/index.cjs"
+        "require": "./dist/lib/node/index.cjs",
+        "default": "./dist/lib/node-esm/index.mjs"
       },
       "types": "./dist/types/src/index.d.ts"
     },
     "./meta": {
       "browser": "./dist/lib/browser/meta.mjs",
       "node": {
-        "default": "./dist/lib/node/meta.cjs"
+        "require": "./dist/lib/node/meta.cjs",
+        "default": "./dist/lib/node-esm/meta.mjs"
       },
       "types": "./dist/types/src/meta.d.ts"
     }
@@ -35,26 +37,26 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/app-framework": "0.6.13",
-    "@dxos/plugin-graph": "0.6.13",
-    "@dxos/local-storage": "0.6.13",
-    "@dxos/react-ui-tabs": "0.6.13",
-    "@dxos/util": "0.6.13"
+    "@dxos/app-framework": "0.6.14-main.7bd9c89",
+    "@dxos/local-storage": "0.6.14-main.7bd9c89",
+    "@dxos/react-ui-tabs": "0.6.14-main.7bd9c89",
+    "@dxos/plugin-graph": "0.6.14-main.7bd9c89",
+    "@dxos/util": "0.6.14-main.7bd9c89"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "@types/react": "~18.2.0",
     "react": "~18.2.0",
-    "vite": "^5.3.4",
-    "@dxos/react-ui": "0.6.13",
-    "@dxos/react-ui-theme": "0.6.13",
-    "@dxos/storybook-utils": "0.6.13"
+    "vite": "5.4.7",
+    "@dxos/react-ui": "0.6.14-main.7bd9c89",
+    "@dxos/react-ui-theme": "0.6.14-main.7bd9c89",
+    "@dxos/storybook-utils": "0.6.14-main.7bd9c89"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
-    "@dxos/react-ui-theme": "0.6.13",
-    "@dxos/react-ui": "0.6.13"
+    "@dxos/react-ui": "0.6.14-main.7bd9c89",
+    "@dxos/react-ui-theme": "0.6.14-main.7bd9c89"
   },
   "publishConfig": {
     "access": "public"

package/src/SettingsPlugin.tsx

@@ -2,7 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Gear, type IconProps } from '@phosphor-icons/react';
 import React from 'react';
 
 import {
@@ -106,8 +105,7 @@ export const SettingsPlugin = (): PluginDefinition<SettingsPluginProvides> => {
                 },
                 properties: {
                   label: ['open settings label', { ns: SETTINGS_PLUGIN }],
-                  icon: (props: IconProps) => <Gear {...props} />,
-                  iconSymbol: 'ph--gear--regular',
+                  icon: 'ph--gear--regular',
                   keyBinding: {
                     macos: 'meta+,',
                     windows: 'alt+,',

package/src/components/SettingsDialog.tsx

@@ -4,7 +4,7 @@
 
 import React, { useState } from 'react';
 
-import { type Plugin, Surface, usePlugins } from '@dxos/app-framework';
+import { type PluginMeta, Surface, usePlugins } from '@dxos/app-framework';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 import { Tabs, type TabsActivePart } from '@dxos/react-ui-tabs';
 import { getSize } from '@dxos/react-ui-theme';
@@ -33,14 +33,19 @@ export const SettingsDialog = ({
     'dxos.org/plugin/registry',
   ];
 
-  const corePlugins = core.map((id) => plugins.find((plugin) => plugin.meta.id === id)?.meta).filter(nonNullable);
+  const sortPlugin = ({ name: a }: PluginMeta, { name: b }: PluginMeta) => a?.localeCompare(b ?? '') ?? 0;
+
+  const corePlugins = core
+    .map((id) => plugins.find((plugin) => plugin.meta.id === id)?.meta)
+    .filter(nonNullable)
+    .sort(sortPlugin);
 
   const filteredPlugins = enabled
     .filter((id) => !core.includes(id))
     .map((id) => plugins.find((plugin) => plugin.meta.id === id))
     .filter((plugin) => (plugin?.provides as any)?.settings)
     .map((plugin) => plugin!.meta)
-    .sort(({ name: a }, { name: b }) => a?.localeCompare(b ?? '') ?? 0);
+    .sort(sortPlugin);
 
   const [tabsActivePart, setTabsActivePart] = useState<TabsActivePart>('list');
 
@@ -83,9 +88,9 @@ export const SettingsDialog = ({
       >
         <Tabs.Viewport classNames='flex-1 min-bs-0'>
           <div role='none' className='overflow-y-auto pli-3 @md:pis-2 @md:pie-0 mbe-4 border-r border-separator'>
-            <Tabs.Tablist classNames='max-bs-none overflow-y-visible'>
+            <Tabs.Tablist classNames='flex flex-col gap-4 max-bs-none overflow-y-visible'>
               <PluginList title='Options' plugins={corePlugins} />
-              {filteredPlugins.length > 0 && <PluginList title='Plugins' plugins={filteredPlugins} gap />}
+              {filteredPlugins.length > 0 && <PluginList title='Plugins' plugins={filteredPlugins} />}
             </Tabs.Tablist>
           </div>
 
@@ -105,15 +110,17 @@ export const SettingsDialog = ({
   );
 };
 
-const PluginList = ({ title, plugins, gap }: { title: string; plugins: Plugin['meta'][]; gap?: boolean }) => {
+const PluginList = ({ title, plugins }: { title: string; plugins: PluginMeta[] }) => {
   return (
-    <>
-      <Tabs.TabGroupHeading classNames={gap ? 'mbs-4' : 'mbs-4 @md:mbs-2'}>{title}</Tabs.TabGroupHeading>
-      {plugins.map((plugin) => (
-        <Tabs.Tab key={plugin.id} value={plugin.id}>
-          {plugin.name}
-        </Tabs.Tab>
-      ))}
-    </>
+    <div role='none'>
+      <Tabs.TabGroupHeading classNames={'pli-1 mlb-2 mbs-4 @md:mbs-2'}>{title}</Tabs.TabGroupHeading>
+      <div className='flex flex-col ml-1'>
+        {plugins.map((plugin) => (
+          <Tabs.Tab key={plugin.id} value={plugin.id}>
+            {plugin.name}
+          </Tabs.Tab>
+        ))}
+      </div>
+    </div>
   );
 };

package/src/meta.ts

@@ -2,8 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
+import { type PluginMeta } from '@dxos/app-framework';
+
 export const SETTINGS_PLUGIN = 'dxos.org/plugin/settings';
 
 export default {
   id: SETTINGS_PLUGIN,
-};
+} satisfies PluginMeta;

package/dist/lib/browser/chunk-JKQMH66V.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nexport const SETTINGS_PLUGIN = 'dxos.org/plugin/settings';\n\nexport default {\n  id: SETTINGS_PLUGIN,\n};\n"],
-  "mappings": ";AAIO,IAAMA,kBAAkB;AAE/B,IAAA,eAAe;EACbC,IAAID;AACN;",
-  "names": ["SETTINGS_PLUGIN", "id"]
-}

package/dist/lib/node/chunk-LZVHLML4.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nexport const SETTINGS_PLUGIN = 'dxos.org/plugin/settings';\n\nexport default {\n  id: SETTINGS_PLUGIN,\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAIO,IAAMA,kBAAkB;AAE/B,IAAA,eAAe;EACbC,IAAID;AACN;",
-  "names": ["SETTINGS_PLUGIN", "id"]
-}