@dxos/plugin-space 0.8.1-main.ae460ac → 0.8.1-staging.31c3ee1

package/src/components/{AdvancedObjectSettings → ObjectSettingsContainer}/AdvancedObjectSettings.tsx

@@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react';
 
 import { type ForeignKey, ForeignKeySchema } from '@dxos/echo-schema';
 import { getMeta, type ReactiveEchoObject } from '@dxos/react-client/echo';
-import { IconButton, useTranslation, Separator } from '@dxos/react-ui';
+import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
 import { ForeignKeys } from './ForeignKeys';
@@ -51,7 +51,6 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
   // TODO(wittjosiah): This should be wrapped in an "Advanced" accordion.
   return (
     <>
-      <Separator />
       <div className='p-2 flex flex-col gap-4'>
         <h2>{t('advanced settings label')}</h2>
         <div className='flex items-center'>
@@ -66,6 +65,7 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
         </div>
         {!adding && <ForeignKeys keys={keys} onDelete={handleDelete} />}
       </div>
+
       {adding && <Form schema={ForeignKeySchema} values={initialValues} onSave={handleSave} onCancel={handleCancel} />}
     </>
   );

package/src/components/ObjectSettingsContainer/BaseObjectSettings.tsx

@@ -0,0 +1,47 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { type PropsWithChildren, useRef } from 'react';
+
+import { type ReactiveEchoObject } from '@dxos/react-client/echo';
+import { Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { mx } from '@dxos/react-ui-theme';
+
+import { meta } from '../../meta';
+
+export type BaseObjectSettingsProps = ThemedClassName<
+  PropsWithChildren<{
+    object: ReactiveEchoObject<any>;
+  }>
+>;
+
+export const BaseObjectSettings = ({ classNames, children, object }: BaseObjectSettingsProps) => {
+  const { t } = useTranslation(meta.id);
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  // TODO(wittjosiah): This should be a form based on the schema of the object.
+  //  The form should only include fields with a specific settings annotation.
+  //  Perhaps also including the field of the title annotation as well.
+  return (
+    <form className={mx('flex flex-col p-2 gap-2', classNames)}>
+      <Input.Root>
+        <Input.Label>{t('name label')}</Input.Label>
+        <Input.TextInput
+          ref={inputRef}
+          placeholder={t('name placeholder')}
+          value={object.name ?? ''}
+          onChange={(event) => {
+            object.name = event.target.value;
+          }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              inputRef.current?.blur();
+            }
+          }}
+        />
+      </Input.Root>
+      {children}
+    </form>
+  );
+};

package/src/components/ObjectSettingsContainer/ObjectSettingsContainer.tsx

@@ -0,0 +1,36 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useMemo } from 'react';
+
+import { Surface } from '@dxos/app-framework';
+import { type ReactiveEchoObject } from '@dxos/react-client/echo';
+import { Clipboard } from '@dxos/react-ui';
+import { StackItem } from '@dxos/react-ui-stack';
+
+import { AdvancedObjectSettings } from './AdvancedObjectSettings';
+import { BaseObjectSettings } from './BaseObjectSettings';
+
+export type ObjectSettingsContainerProps = {
+  object: ReactiveEchoObject<any>;
+  role: string;
+};
+
+export const ObjectSettingsContainer = ({ object, role }: ObjectSettingsContainerProps) => {
+  const data = useMemo(() => ({ subject: object }), [object]);
+
+  return (
+    <Clipboard.Provider>
+      <StackItem.Content toolbar={false} role={role}>
+        <div className='flex flex-col overflow-y-auto divide-y divide-separator'>
+          <BaseObjectSettings object={object}>
+            <Surface role='base-object-settings' data={data} />
+          </BaseObjectSettings>
+          <Surface role='object-settings' data={data} />
+          <AdvancedObjectSettings object={object} />
+        </div>
+      </StackItem.Content>
+    </Clipboard.Provider>
+  );
+};

package/src/components/ObjectSettingsContainer/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './ObjectSettingsContainer';

package/src/components/PopoverRenameObject.tsx

@@ -38,7 +38,7 @@ export const PopoverRenameObject = ({ object: obj }: { object: ReactiveObject<an
         <Input.Root>
           <Input.Label srOnly>{t('object name label')}</Input.Label>
           <Input.TextInput
-            placeholder={t('object title placeholder')}
+            placeholder={t('object placeholder')}
             value={name}
             data-testid='spacePlugin.renameObject.input'
             onChange={({ target: { value } }) => setName(value)}

package/src/components/SpacePresence.tsx

@@ -12,8 +12,7 @@ import { getSpace, useMembers, type SpaceMember, fullyQualifiedId } from '@dxos/
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import {
   Avatar,
-  AvatarGroup,
-  AvatarGroupItem,
+  type AvatarContentProps,
   type Size,
   type ThemedClassName,
   Tooltip,
@@ -113,16 +112,16 @@ export const FullPresence = (props: MemberPresenceProps) => {
   }
 
   return (
-    <AvatarGroup.Root size={size} classNames='mbs-2 mie-4' data-testid='spacePlugin.presence'>
+    <div className='dx-avatar-group' data-testid='spacePlugin.presence'>
       {members.slice(0, 3).map((member, i) => (
         <Tooltip.Root key={member.identity.identityKey.toHex()}>
           <Tooltip.Trigger>
             <PrensenceAvatar
               identity={member.identity}
-              group
               match={member.currentlyAttended} // TODO(Zan): Match always true now we're showing 'members viewing current object'.
               index={members.length - i}
               onClick={() => onMemberClick?.(member)}
+              size={size}
             />
           </Tooltip.Trigger>
           <Tooltip.Portal>
@@ -137,12 +136,14 @@ export const FullPresence = (props: MemberPresenceProps) => {
       {members.length > 3 && (
         <Tooltip.Root>
           <Tooltip.Trigger>
-            <AvatarGroupItem.Root status='inactive'>
-              <Avatar.Frame style={{ zIndex: members.length - 4 }}>
-                {/* TODO(wittjosiah): Make text fit. */}
-                <Avatar.Fallback text={`+${members.length - 3}`} />
-              </Avatar.Frame>
-            </AvatarGroupItem.Root>
+            <Avatar.Root>
+              {/* TODO(wittjosiah): Make text fit. */}
+              <Avatar.Content
+                status='inactive'
+                style={{ zIndex: members.length - 4 }}
+                fallback={`+${members.length - 3}`}
+              />
+            </Avatar.Root>
           </Tooltip.Trigger>
           <Tooltip.Portal>
             <Tooltip.Content side='bottom'>
@@ -156,7 +157,7 @@ export const FullPresence = (props: MemberPresenceProps) => {
                     data-testid='identity-list-item'
                   >
                     {/* TODO(Zan): Match always true now we're showing 'members viewing current object'. */}
-                    <PrensenceAvatar identity={member.identity} showName match={member.currentlyAttended} />
+                    <PrensenceAvatar identity={member.identity} size={size} showName match={member.currentlyAttended} />
                   </ListItem.Root>
                 ))}
               </List>
@@ -164,35 +165,36 @@ export const FullPresence = (props: MemberPresenceProps) => {
           </Tooltip.Portal>
         </Tooltip.Root>
       )}
-    </AvatarGroup.Root>
+    </div>
   );
 };
 
-type PresenceAvatarProps = {
+type PresenceAvatarProps = Pick<AvatarContentProps, 'size'> & {
   identity: Identity;
   showName?: boolean;
   match?: boolean;
-  group?: boolean;
   index?: number;
   onClick?: () => void;
 };
 
-const PrensenceAvatar = ({ identity, showName, match, group, index, onClick }: PresenceAvatarProps) => {
-  const Root = group ? AvatarGroupItem.Root : Avatar.Root;
+const PrensenceAvatar = ({ identity, showName, match, index, onClick, size }: PresenceAvatarProps) => {
   const status = match ? 'current' : 'active';
   const fallbackValue = keyToFallback(identity.identityKey);
   return (
-    <Root status={status} hue={identity.profile?.data?.hue || fallbackValue.hue}>
-      <Avatar.Frame
+    <Avatar.Root>
+      <Avatar.Content
+        status={status}
+        hue={identity.profile?.data?.hue || fallbackValue.hue}
         data-testid='spacePlugin.presence.member'
         data-status={status}
+        size={size}
+        classNames='mbs-2 mie-4'
         {...(index ? { style: { zIndex: index } } : {})}
         onClick={() => onClick?.()}
-      >
-        <Avatar.Fallback text={identity.profile?.data?.emoji || fallbackValue.emoji} />
-      </Avatar.Frame>
-      {showName && <Avatar.Label classNames='text-sm truncate pli-2'>{getName(identity)}</Avatar.Label>}
-    </Root>
+        fallback={identity.profile?.data?.emoji || fallbackValue.emoji}
+      />
+      <Avatar.Label classNames={showName ? 'text-sm truncate pli-2' : 'sr-only'}>{getName(identity)}</Avatar.Label>
+    </Avatar.Root>
   );
 };
 

package/src/components/SpaceSettings/{SpaceSettingsPanel.stories.tsx → SpacePropertiesForm.stories.tsx}

@@ -10,21 +10,21 @@ import React from 'react';
 import { useClientProvider, withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/storybook-utils';
 
-import { SpaceSettingsPanel, type SpaceSettingsPanelProps } from './SpaceSettingsPanel';
+import { SpacePropertiesForm, type SpacePropertiesFormProps } from './SpacePropertiesForm';
 import translations from '../../translations';
 
-const Story = (args: Partial<SpaceSettingsPanelProps>) => {
+const Story = (args: Partial<SpacePropertiesFormProps>) => {
   const { space } = useClientProvider();
   return (
     <div role='none' className='p-2 border border-primary-500 rounded'>
-      <SpaceSettingsPanel {...args} space={space!} />
+      <SpacePropertiesForm {...args} space={space!} />
     </div>
   );
 };
 
 const meta: Meta = {
-  title: 'plugins/plugin-space/SpaceSettingsPanel',
-  component: SpaceSettingsPanel,
+  title: 'plugins/plugin-space/SpacePropertiesForm',
+  component: SpacePropertiesForm,
   render: Story,
   decorators: [withClientProvider({ createIdentity: true, createSpace: true }), withTheme],
   parameters: {
@@ -35,4 +35,4 @@ const meta: Meta = {
 
 export default meta;
 
-export const Default: StoryObj<typeof SpaceSettingsPanel> = {};
+export const Default: StoryObj<typeof SpacePropertiesForm> = {};

package/src/components/SpaceSettings/SpacePropertiesForm.tsx

@@ -0,0 +1,136 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Schema as S } from 'effect';
+import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
+
+import { log } from '@dxos/log';
+import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { type Space } from '@dxos/react-client/echo';
+import { Input, useTranslation } from '@dxos/react-ui';
+import { Form, type InputComponent, ControlItem, ControlItemInput } from '@dxos/react-ui-form';
+import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
+
+import { SPACE_PLUGIN } from '../../meta';
+import { SpaceForm } from '../../types';
+
+export type SpacePropertiesFormProps = {
+  space: Space;
+};
+
+export const SpacePropertiesForm = ({ space }: SpacePropertiesFormProps) => {
+  const { t } = useTranslation(SPACE_PLUGIN);
+
+  const [edgeReplication, setEdgeReplication] = useState(
+    space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED,
+  );
+  const toggleEdgeReplication = useCallback(
+    async (next: boolean) => {
+      setEdgeReplication(next);
+      await space?.internal
+        .setEdgeReplicationPreference(next ? EdgeReplicationSetting.ENABLED : EdgeReplicationSetting.DISABLED)
+        .catch((err: unknown) => {
+          log.catch(err);
+          setEdgeReplication(!next);
+        });
+    },
+    [space],
+  );
+
+  const handleSave = useCallback(
+    (properties: S.Schema.Type<typeof SpaceForm>) => {
+      void toggleEdgeReplication(properties.edgeReplication);
+      if (properties.name !== space.properties.name) {
+        space.properties.name = properties.name;
+      }
+      if (properties.icon !== space.properties.icon) {
+        space.properties.icon = properties.icon;
+      }
+      if (properties.hue !== space.properties.hue) {
+        space.properties.hue = properties.hue;
+      }
+    },
+    [space, toggleEdgeReplication],
+  );
+
+  const values = useMemo(
+    () => ({
+      name: space.properties.name,
+      icon: space.properties.icon,
+      hue: space.properties.hue,
+      edgeReplication,
+    }),
+    [space.properties.name, space.properties.icon, space.properties.hue, edgeReplication],
+  );
+
+  const customElements: Partial<Record<string, InputComponent>> = useMemo(
+    () => ({
+      name: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback(
+          ({ target: { value } }: ChangeEvent<HTMLInputElement>) => onValueChange(type, value),
+          [onValueChange, type],
+        );
+        return (
+          <ControlItemInput title={label} description={t('display name description')}>
+            <Input.TextInput
+              value={getValue()}
+              onChange={handleChange}
+              placeholder={t('display name input placeholder')}
+              classNames='min-is-64'
+            />
+          </ControlItemInput>
+        );
+      },
+      icon: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback((nextEmoji: string) => onValueChange(type, nextEmoji), [onValueChange, type]);
+        const handleEmojiReset = useCallback(() => onValueChange(type, undefined), [onValueChange, type]);
+        return (
+          <ControlItem title={label} description={t('icon description')}>
+            <IconPicker
+              value={getValue()}
+              onChange={handleChange}
+              onReset={handleEmojiReset}
+              classNames='justify-self-end'
+              iconSize={5}
+            />
+          </ControlItem>
+        );
+      },
+      hue: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback((nextHue: string) => onValueChange(type, nextHue), [onValueChange, type]);
+        const handleHueReset = useCallback(() => onValueChange(type, undefined), [onValueChange, type]);
+        return (
+          <ControlItem title={label} description={t('hue description')}>
+            <HuePicker
+              value={getValue()}
+              onChange={handleChange}
+              onReset={handleHueReset}
+              classNames='[--hue-preview-size:1.25rem] justify-self-end'
+            />
+          </ControlItem>
+        );
+      },
+      edgeReplication: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback((checked: boolean) => onValueChange(type, checked), [onValueChange, type]);
+        return (
+          <ControlItemInput title={label} description={t('edge replication description')}>
+            <Input.Switch checked={getValue()} onCheckedChange={handleChange} classNames='justify-self-end' />
+          </ControlItemInput>
+        );
+      },
+    }),
+    [t],
+  );
+
+  return (
+    <Form
+      schema={SpaceForm}
+      values={values}
+      autoSave
+      onSave={handleSave}
+      Custom={customElements}
+      classNames='p-0 container-max-width [&_[role="form"]]:grid [&_[role="form"]]:grid-cols-1 md:[&_[role="form"]]:grid-cols-[1fr_min-content] [&_[role="form"]]:gap-4'
+    />
+  );
+};

package/src/components/SpaceSettings/SpaceSettingsContainer.tsx

@@ -0,0 +1,63 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useCallback, useMemo } from 'react';
+
+import { Surface, useCapabilities, useCapability } from '@dxos/app-framework';
+import { type Space } from '@dxos/react-client/echo';
+import { toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { ControlSectionHeading } from '@dxos/react-ui-form';
+import { Accordion } from '@dxos/react-ui-list';
+import { StackItem } from '@dxos/react-ui-stack';
+import { byPosition } from '@dxos/util';
+
+import { SpaceCapabilities } from '../../capabilities';
+import { SPACE_PLUGIN } from '../../meta';
+
+export const SPACE_SETTINGS_DIALOG = `${SPACE_PLUGIN}/SpaceSettingsDialog`;
+
+export type SpaceSettingsTab = 'members' | 'settings';
+
+export type SpaceSettingsContainerProps = {
+  space: Space;
+};
+
+export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) => {
+  const { t } = useTranslation(SPACE_PLUGIN);
+  const state = useCapability(SpaceCapabilities.MutableState);
+  const items = useCapabilities(SpaceCapabilities.SettingsSection).toSorted(byPosition);
+  const data = useMemo(() => ({ subject: space }), [space]);
+
+  const handleOpenSectionChange = useCallback(
+    (sections: string[]) => {
+      state.spaceSettingsOpenSections.splice(0, state.spaceSettingsOpenSections.length, ...sections);
+    },
+    [state],
+  );
+
+  return (
+    <StackItem.Content classNames='p-2 block overflow-y-auto'>
+      <Accordion.Root<SpaceCapabilities.SettingsSection>
+        items={items}
+        value={state.spaceSettingsOpenSections}
+        onValueChange={handleOpenSectionChange}
+      >
+        {({ items }) => (
+          <>
+            {items.map((item) => (
+              <Accordion.Item key={item.id} item={item} classNames='container-max-width'>
+                <Accordion.ItemHeader classNames='pie-6' asChild>
+                  <ControlSectionHeading title={toLocalizedString(item.label, t)} />
+                </Accordion.ItemHeader>
+                <Accordion.ItemBody>
+                  <Surface role={`space-settings--${item.id}`} data={data} />
+                </Accordion.ItemBody>
+              </Accordion.Item>
+            ))}
+          </>
+        )}
+      </Accordion.Root>
+    </StackItem.Content>
+  );
+};

package/src/components/SpaceSettings/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './SpaceSettingsDialog';
-export * from './SpaceSettingsPanel';
+export * from './SpacePropertiesForm';
+export * from './SpaceSettingsContainer';

package/src/components/SyncStatus/SyncStatus.tsx

@@ -94,7 +94,7 @@ export const SyncStatusDetail = ({ classNames, state, summary, debug }: SyncStat
 
   // TODO(burdon): Normalize to max document count?
   return (
-    <div className={mx('flex flex-col gap-3 p-2 text-xs min-w-96', classNames)}>
+    <div className={mx('flex flex-col gap-3 p-2 text-xs min-w-[400px]', classNames)}>
       <div role='none' className='flex items-center'>
         <h1 className='flex-1'>{t('sync status title')}</h1>
         <div className='flex items-center gap-2'>

package/src/components/SyncStatus/save-tracker.ts

@@ -2,13 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type UnsubscribeCallback } from '@dxos/async';
+import { type CleanupFn } from '@dxos/async';
 import { type Client } from '@dxos/client';
 import { type Space, type SpaceId } from '@dxos/client/echo';
 import { Context } from '@dxos/context';
 
 export const createClientSaveTracker = (client: Client, cb: (state: 'saved' | 'saving') => void) => {
-  const unsubscribeCallbacks: Record<SpaceId, UnsubscribeCallback> = {};
+  const CleanupFns: Record<SpaceId, CleanupFn> = {};
   const state: Record<SpaceId, 'saved' | 'saving'> = {};
 
   const install = (spaces: Space[]) => {
@@ -18,7 +18,7 @@ export const createClientSaveTracker = (client: Client, cb: (state: 'saved' | 's
       }
 
       state[space.id] = 'saved';
-      unsubscribeCallbacks[space.id] = createSpaceSaveTracker(space, (s) => {
+      CleanupFns[space.id] = createSpaceSaveTracker(space, (s) => {
         state[space.id] = s;
         cb(Object.values(state).some((s) => s === 'saving') ? 'saving' : 'saved');
       });
@@ -30,13 +30,13 @@ export const createClientSaveTracker = (client: Client, cb: (state: 'saved' | 's
   install(client.spaces.get());
 
   return () => {
-    for (const unsubscribe of Object.values(unsubscribeCallbacks)) {
+    for (const unsubscribe of Object.values(CleanupFns)) {
       unsubscribe();
     }
   };
 };
 
-const createSpaceSaveTracker = (space: Space, cb: (state: 'saved' | 'saving') => void): UnsubscribeCallback => {
+const createSpaceSaveTracker = (space: Space, cb: (state: 'saved' | 'saving') => void): CleanupFn => {
   const ctx = new Context();
 
   void space.waitUntilReady().then(() => {

package/src/components/index.ts

@@ -2,14 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './AdvancedObjectSettings';
 export * from './AwaitingObject';
-export * from './BaseObjectSettings';
 export * from './CreateDialog';
 export * from './CollectionMain';
 export * from './CollectionSection';
 export * from './JoinDialog';
+export * from './MembersContainer';
 export * from './MenuFooter';
+export * from './ObjectSettingsContainer';
 export * from './PersistenceStatus';
 export * from './PopoverAddSpace';
 export * from './PopoverRenameObject';

package/src/events.ts

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { defineEvent } from '@dxos/app-framework';
+import { defineEvent, Events } from '@dxos/app-framework';
 
 import { SPACE_PLUGIN } from './meta';
 
 export namespace SpaceEvents {
+  export const StateReady = Events.createStateEvent(`${SPACE_PLUGIN}/event/state-ready`);
   export const SetupSettingsPanel = defineEvent(`${SPACE_PLUGIN}/event/setup-settings-panel`);
-  export const StateReady = defineEvent(`${SPACE_PLUGIN}/event/state-ready`);
   export const DefaultSpaceReady = defineEvent(`${SPACE_PLUGIN}/event/default-space-ready`);
 }
 

package/src/meta.ts

@@ -6,8 +6,8 @@ import { type PluginMeta } from '@dxos/app-framework';
 
 export const SPACE_PLUGIN = 'dxos.org/plugin/space';
 
-export const meta = {
+export const meta: PluginMeta = {
   id: SPACE_PLUGIN,
   name: 'Spaces',
   icon: 'ph--planet--regular',
-} satisfies PluginMeta;
+};

package/src/translations.ts

@@ -10,6 +10,7 @@ export default [
     'en-US': {
       [CollectionType.typename]: {
         'typename label': 'Collection',
+        'object name placeholder': 'New collection',
       },
       [SPACE_PLUGIN]: {
         'plugin name': 'Spaces',
@@ -39,7 +40,7 @@ export default [
         'confirm restore title': 'Overwrite files in this space?',
         'confirm restore body': 'Restoring from a backup will overwrite the contents of any documents that match.',
         'upload file message': 'Drag file here or click to browse',
-        'object title placeholder': 'Type a title here…',
+        'object placeholder': 'Type a title here…',
         'personal space label': 'Personal Space',
         'spaces label': 'Spaces',
         'show hidden spaces label': 'Show closed spaces',
@@ -64,9 +65,6 @@ export default [
         'missing object message': 'Object not available.',
         'missing object description':
           'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
-        'create collection label': 'Create collection',
-        'unnamed object label': 'New object',
-        'unnamed collection label': 'New collection',
         'create object in space label': 'Add to space',
         'create object in collection label': 'Add to collection',
         'share space label': 'Share',
@@ -98,18 +96,13 @@ export default [
         'join success label': 'Successfully joined space',
         'name label': 'Name',
         'name placeholder': 'Name',
-        'unnamed object settings label': 'Settings',
+        'object settings label': 'Settings',
         'edge replication label': 'Enable EDGE Replication',
         'saving locally label': 'Writing to disk',
         'downloading label': 'Replicating from peers',
         'uploading label': 'Replicating to peers',
         'offline persisted label': 'Saved to disk (offline)',
         'remote synced label': 'Synced with peers',
-        'open settings panel label': 'Show Settings',
-        'settings panel label': 'Settings',
-        'open space settings label': 'Space Settings',
-        'members tab label': 'Members',
-        'settings tab label': 'Settings',
         'syncing label': 'Space syncing',
         'show all label': 'Show all',
         'no sync status label': 'No space with missing objects.',
@@ -125,8 +118,24 @@ export default [
         'advanced settings label': 'Advanced',
         'foreign keys': 'Foreign Keys',
         'add key': 'Add Key',
-        'icon label': 'Icon',
-        'hue label': 'Color',
+
+        'members panel label': 'Members',
+        'members verbose label': 'Manage space members',
+        'members description': 'You can view the current status of space members here as well as invite new members.',
+        'members label': 'Members',
+        'invitations label': 'Invitations',
+        'space invitation description': 'Manage invitations to the space.',
+        'qr code description': 'Share this QR code, or copy the URL and share it with the person you want to invite.',
+
+        'settings panel label': 'Space Settings',
+        'open space settings label': 'Space Settings',
+        'space settings properties label': 'General',
+        'display name input placeholder': 'Space name',
+        'display name description': 'Name of the space as it appears in the app.',
+        'icon description': 'Icon used to represent the space in the app.',
+        'hue description': 'Color used to represent the space in the app.',
+        'edge replication description':
+          "Only change this if you know what you're doing. Disabling this will prevent the space from replicating through Composer's EDGE services, and relies solely on peer-to-peer sync.",
       },
     },
   },