From 87615366ce6380739e69a49d8e0d77bf29db6e5c Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 4 Aug 2026 14:04:21 +0300
Subject: [PATCH 01/12] feat(composer): edit shared posts in the new composer

Editing a shared link still opened the old /posts/[id]/edit page: the
menu only routed freeform and welcome posts to SmartComposerModal, and
the modal forced kind to 'text' whenever editPost was set, so it could
not represent a share at all.

- Derive the kind from editPost.type, prefill the commentary the way the
  old page did (a share with no commentary carries the shared post's own
  title, which is not the author's text), and seed the preview from the
  post rather than refetching it
- Lock the URL while editing: only the commentary is editable, matching
  what the API accepts
- Add the missing edit branch to submitLink, including the moderation
  path, which completes without a toast of its own
- Route share posts to the modal; moderation items keep the page, which
  edits a pending submission the composer cannot represent
- Delete CreateLiveRoomForm and CreatePoll, referenced by nothing

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../liveRooms/CreateLiveRoomForm.spec.tsx     | 192 ----------
 .../liveRooms/CreateLiveRoomForm.tsx          | 345 ------------------
 .../modals/post/SmartComposerModal.spec.tsx   |  79 ++++
 .../modals/post/SmartComposerModal.tsx        |  54 ++-
 .../post/composer/LinkForm.spec.tsx           |  41 ++-
 .../src/components/post/composer/LinkForm.tsx |  88 +++--
 .../post/composer/useComposerSubmit.spec.tsx  | 108 ++++++
 .../post/composer/useComposerSubmit.ts        |  21 +-
 .../src/components/post/poll/CreatePoll.tsx   | 152 --------
 .../src/features/posts/PostOptionButton.tsx   |   6 +-
 10 files changed, 352 insertions(+), 734 deletions(-)
 delete mode 100644 packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx
 delete mode 100644 packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx
 create mode 100644 packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
 delete mode 100644 packages/shared/src/components/post/poll/CreatePoll.tsx

diff --git a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx b/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx
deleted file mode 100644
index 3fa07f4174f..00000000000
--- a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.spec.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import React from 'react';
-import { CreateLiveRoomForm } from './CreateLiveRoomForm';
-import { LiveRoomMode } from '../../graphql/liveRooms';
-
-const mockCreateLiveRoom = jest.fn();
-const mockDisplayToast = jest.fn();
-const mockLogEvent = jest.fn();
-const mockUseAuthContext = jest.fn();
-
-jest.mock('../../hooks/liveRooms/useCreateLiveRoom', () => ({
-  useCreateLiveRoom: () => ({
-    mutateAsync: mockCreateLiveRoom,
-    isPending: false,
-  }),
-}));
-
-jest.mock('../../hooks/useToastNotification', () => ({
-  useToastNotification: () => ({ displayToast: mockDisplayToast }),
-}));
-
-jest.mock('../fields/RichTextInput', () => ({
-  __esModule: true,
-  default: ({
-    initialContent,
-    maxInputLength,
-    onValueUpdate,
-    textareaProps,
-  }: {
-    initialContent?: string;
-    maxInputLength?: number;
-    onValueUpdate?: (value: string) => void;
-    textareaProps?: React.TextareaHTMLAttributes<HTMLTextAreaElement>;
-  }) => (
-    <textarea
-      aria-label={textareaProps?.['aria-label']}
-      maxLength={maxInputLength}
-      placeholder={textareaProps?.placeholder}
-      defaultValue={initialContent}
-      onInput={(event) => onValueUpdate?.(event.currentTarget.value)}
-    />
-  ),
-}));
-
-jest.mock('../../contexts/AuthContext', () => ({
-  useAuthContext: () => mockUseAuthContext(),
-}));
-
-jest.mock('../../contexts/LogContext', () => ({
-  useLogContext: () => ({ logEvent: mockLogEvent }),
-}));
-
-const DESCRIPTION_PLACEHOLDER =
-  'Add context, drop daily.dev posts to react to, or jot down questions for the room. Shown in the lobby while people RSVP, and in the Agenda tab once the standup is live.';
-
-const createJoinToken = () => ({
-  role: 'host',
-  token: 'join-token',
-  room: {
-    id: 'room-1',
-    topic: 'Open mic',
-    mode: LiveRoomMode.Moderated,
-    status: 'created',
-    createdAt: '2026-04-28T00:00:00.000Z',
-    updatedAt: '2026-04-28T00:00:00.000Z',
-    startedAt: null,
-    endedAt: null,
-    scheduledStart: null,
-    descriptionHtml: null,
-    subscribed: false,
-    contentEmbeds: [],
-    host: {
-      id: '1',
-      name: 'Host',
-      username: 'host',
-      image: '',
-      permalink: '#',
-    },
-  },
-});
-
-describe('CreateLiveRoomForm', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockCreateLiveRoom.mockResolvedValue(createJoinToken());
-    mockUseAuthContext.mockReturnValue({
-      user: { id: 'user-1', timezone: 'Asia/Jerusalem' },
-    });
-  });
-
-  afterEach(() => {
-    jest.useRealTimers();
-  });
-
-  it('creates a moderated standup with the entered topic', async () => {
-    const onCreated = jest.fn();
-
-    render(<CreateLiveRoomForm onCreated={onCreated} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Structured discussion' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Create standup' }));
-
-    await waitFor(() => {
-      expect(mockCreateLiveRoom).toHaveBeenCalledWith({
-        topic: 'Structured discussion',
-        mode: LiveRoomMode.Moderated,
-        scheduledStart: undefined,
-        description: undefined,
-      });
-    });
-    expect(onCreated).toHaveBeenCalledTimes(1);
-  });
-
-  it('submits scheduled lobby fields as UTC and explains the local delta', async () => {
-    jest.useFakeTimers().setSystemTime(new Date('2026-05-04T07:00:00.000Z'));
-
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Scheduled lobby' },
-    });
-    fireEvent.input(screen.getByPlaceholderText(DESCRIPTION_PLACEHOLDER), {
-      target: { value: '## Agenda\nhttps://daily.dev/posts/example' },
-    });
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-
-    expect(screen.getByText(/30 minutes from now/)).toBeInTheDocument();
-    expect(screen.getByText(/UTC \+3/)).toBeInTheDocument();
-    expect(
-      screen.getByRole('link', { name: 'Change timezone' }),
-    ).toHaveAttribute('href', 'https://r.daily.dev/timezone');
-
-    fireEvent.change(screen.getByLabelText('Scheduled time'), {
-      target: { value: '2026-05-04T12:00' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Schedule standup' }));
-
-    await waitFor(() => {
-      expect(mockCreateLiveRoom).toHaveBeenCalledWith({
-        topic: 'Scheduled lobby',
-        mode: LiveRoomMode.Moderated,
-        scheduledStart: '2026-05-04T09:00:00.000Z',
-        description: '## Agenda\nhttps://daily.dev/posts/example',
-      });
-    });
-    expect(mockLogEvent).toHaveBeenCalledWith(
-      expect.objectContaining({
-        event_name: 'create standup',
-        target_id: 'room-1',
-        extra: expect.stringContaining('"scheduled":true'),
-      }),
-    );
-  });
-
-  it('does not submit scheduled lobbies in the past', async () => {
-    jest.useFakeTimers().setSystemTime(new Date('2026-05-04T07:00:00.000Z'));
-
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    fireEvent.change(screen.getByPlaceholderText('Topic'), {
-      target: { value: 'Scheduled lobby' },
-    });
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-    fireEvent.change(screen.getByLabelText('Scheduled time'), {
-      target: { value: '2026-05-04T09:30' },
-    });
-    fireEvent.click(screen.getByRole('button', { name: 'Schedule standup' }));
-
-    await waitFor(() => {
-      expect(
-        screen.getByText('Scheduled time must be in the future'),
-      ).toBeInTheDocument();
-    });
-    expect(mockCreateLiveRoom).not.toHaveBeenCalled();
-  });
-
-  it('swaps submit copy based on schedule choice', () => {
-    render(<CreateLiveRoomForm onCreated={jest.fn()} />);
-
-    expect(
-      screen.getByRole('button', { name: 'Create standup' }),
-    ).toBeInTheDocument();
-
-    fireEvent.click(screen.getByLabelText('Schedule for later'));
-
-    expect(
-      screen.getByRole('button', { name: 'Schedule standup' }),
-    ).toBeInTheDocument();
-  });
-});
diff --git a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx b/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx
deleted file mode 100644
index a60d1a1aad1..00000000000
--- a/packages/shared/src/components/liveRooms/CreateLiveRoomForm.tsx
+++ /dev/null
@@ -1,345 +0,0 @@
-import type { ReactElement } from 'react';
-import React, { useMemo } from 'react';
-import { Controller, FormProvider, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import zonedTimeToUtc from 'date-fns-tz/zonedTimeToUtc';
-import { Radio } from '../fields/Radio';
-import {
-  Typography,
-  TypographyColor,
-  TypographyTag,
-  TypographyType,
-} from '../typography/Typography';
-import { Button, ButtonVariant } from '../buttons/Button';
-import ControlledTextField from '../fields/ControlledTextField';
-import { TextField } from '../fields/TextField';
-import RichTextInput from '../fields/RichTextInput';
-import type { LiveRoomJoinToken } from '../../graphql/liveRooms';
-import { useSubmitStandup } from '../../hooks/liveRooms/useSubmitStandup';
-import { useAuthContext } from '../../contexts/AuthContext';
-import {
-  dateFormatInTimezone,
-  DEFAULT_TIMEZONE,
-  getTimezoneOffsetLabel,
-} from '../../lib/timezones';
-import { timezoneSettingsUrl } from '../../lib/constants';
-import Link from '../utilities/Link';
-import { CREATE_LIVE_ROOM_FORM_ID } from '../fields/form/common';
-import styles from '../fields/dateTimeInput.module.css';
-
-const DEFAULT_SCHEDULE_DELAY_MS = 30 * 60 * 1000;
-const TOPIC_MAX_LENGTH = 280;
-const DESCRIPTION_MAX_LENGTH = 4000;
-
-type ScheduleChoice = 'now' | 'later';
-
-const createLiveRoomFormSchema = z
-  .object({
-    topic: z
-      .string()
-      .trim()
-      .min(1, 'Topic is required')
-      .max(
-        TOPIC_MAX_LENGTH,
-        `Topic must be ${TOPIC_MAX_LENGTH} characters or less`,
-      ),
-    scheduleChoice: z.enum(['now', 'later']),
-    scheduledStart: z.string().optional(),
-    description: z
-      .string()
-      .trim()
-      .max(
-        DESCRIPTION_MAX_LENGTH,
-        'Description must be 4000 characters or less',
-      )
-      .optional(),
-  })
-  .superRefine((values, ctx) => {
-    if (values.scheduleChoice === 'later' && !values.scheduledStart) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        path: ['scheduledStart'],
-        message: 'Scheduled time is required',
-      });
-    }
-  });
-
-type CreateLiveRoomFormValues = z.infer<typeof createLiveRoomFormSchema>;
-
-const getDefaultScheduledStart = (timezone: string): string =>
-  dateFormatInTimezone(
-    new Date(Date.now() + DEFAULT_SCHEDULE_DELAY_MS),
-    "yyyy-MM-dd'T'HH:mm",
-    timezone,
-  );
-
-const formatScheduleDelta = (date: Date | null): string | null => {
-  if (!date) {
-    return null;
-  }
-
-  const diffMs = date.getTime() - Date.now();
-  if (diffMs <= 0) {
-    return 'now';
-  }
-
-  const minutes = Math.max(1, Math.round(diffMs / 60_000));
-  if (minutes < 60) {
-    return `${minutes} minute${minutes === 1 ? '' : 's'} from now`;
-  }
-
-  const hours = Math.round(minutes / 60);
-  if (hours < 24) {
-    return `${hours} hour${hours === 1 ? '' : 's'} from now`;
-  }
-
-  const days = Math.round(hours / 24);
-  return `${days} day${days === 1 ? '' : 's'} from now`;
-};
-
-const parseScheduledStart = (value: string | undefined, timezone: string) => {
-  if (!value) {
-    return null;
-  }
-
-  const date = zonedTimeToUtc(value, timezone);
-  return Number.isNaN(date.getTime()) ? null : date;
-};
-
-interface CreateLiveRoomFormProps {
-  onCreated: (joinToken: LiveRoomJoinToken) => void;
-}
-
-export const CreateLiveRoomForm = ({
-  onCreated,
-}: CreateLiveRoomFormProps): ReactElement => {
-  const { user } = useAuthContext();
-  const { submit: submitStandup, isPending } = useSubmitStandup();
-  const timezone = user?.timezone || DEFAULT_TIMEZONE;
-  const timezoneLabel = getTimezoneOffsetLabel(timezone);
-  const defaultScheduledStart = useMemo(
-    () => getDefaultScheduledStart(timezone),
-    [timezone],
-  );
-
-  const form = useForm<CreateLiveRoomFormValues>({
-    resolver: zodResolver(createLiveRoomFormSchema),
-    defaultValues: {
-      topic: '',
-      scheduleChoice: 'now',
-      scheduledStart: defaultScheduledStart,
-      description: '',
-    },
-  });
-  const scheduleChoice = form.watch('scheduleChoice');
-  const scheduledStart = form.watch('scheduledStart');
-  const scheduledStartDate = parseScheduledStart(scheduledStart, timezone);
-  const isScheduled = scheduleChoice === 'later';
-  const scheduleDelta = isScheduled
-    ? formatScheduleDelta(scheduledStartDate)
-    : null;
-  const submitCopy = isScheduled ? 'Schedule standup' : 'Create standup';
-
-  const onSubmit = form.handleSubmit(async (values) => {
-    const result = await submitStandup(values);
-    if (result.type === 'error') {
-      form.setError(result.error.field, { message: result.error.message });
-      return;
-    }
-    if (result.type === 'success') {
-      onCreated(result.joinToken);
-    }
-  });
-
-  return (
-    <FormProvider {...form}>
-      <form
-        id={CREATE_LIVE_ROOM_FORM_ID}
-        onSubmit={onSubmit}
-        className="flex flex-col gap-5"
-      >
-        <Typography
-          type={TypographyType.Callout}
-          color={TypographyColor.Tertiary}
-        >
-          Standups are short, host-led audio and video rooms on daily.dev. Pick
-          a topic, optionally schedule it, and go live when you&apos;re ready.
-          Standups don&apos;t start automatically.
-        </Typography>
-        <ControlledTextField
-          name="topic"
-          label="Topic"
-          placeholder="What do you want to talk about?"
-          maxLength={TOPIC_MAX_LENGTH}
-          hint="Keep it short and specific. Examples: “AMA: shipping a side project in 24h”, “Live code review: Next.js refactor”."
-        />
-        <Controller
-          control={form.control}
-          name="scheduleChoice"
-          render={({ field }) => (
-            <div className="flex flex-col gap-2">
-              <Typography type={TypographyType.Footnote} bold>
-                When do you want to start?
-              </Typography>
-              <Radio<ScheduleChoice>
-                name={field.name}
-                value={field.value}
-                onChange={(value) => {
-                  field.onChange(value);
-                  if (value === 'later' && !form.getValues('scheduledStart')) {
-                    form.setValue('scheduledStart', defaultScheduledStart, {
-                      shouldDirty: true,
-                      shouldValidate: true,
-                    });
-                  }
-                }}
-                options={[
-                  {
-                    value: 'now',
-                    label: 'Start now',
-                    className: { wrapper: 'gap-0' },
-                    afterElement: (
-                      <Typography
-                        type={TypographyType.Caption1}
-                        color={TypographyColor.Tertiary}
-                        className="-mt-1 pl-10"
-                      >
-                        Open the room immediately. You&apos;ll still need to
-                        click &quot;Go live&quot; before listeners can join.
-                      </Typography>
-                    ),
-                  },
-                  {
-                    value: 'later',
-                    label: 'Schedule for later',
-                    className: { wrapper: 'gap-0' },
-                    afterElement: (
-                      <Typography
-                        type={TypographyType.Caption1}
-                        color={TypographyColor.Tertiary}
-                        className="-mt-1 pl-10"
-                      >
-                        Open a lobby where people can RSVP, chat, and get
-                        notified when you go live.
-                      </Typography>
-                    ),
-                  },
-                ]}
-              />
-            </div>
-          )}
-        />
-        {isScheduled ? (
-          <Controller
-            control={form.control}
-            name="scheduledStart"
-            render={({ field, fieldState }) => (
-              <div className="flex flex-col gap-1">
-                <TextField
-                  inputId={field.name}
-                  name={field.name}
-                  label="Scheduled time"
-                  aria-label="Scheduled time"
-                  type="datetime-local"
-                  value={field.value ?? ''}
-                  onChange={field.onChange}
-                  onBlur={field.onBlur}
-                  valid={!fieldState.error}
-                  className={{ input: styles.dateTimeInput }}
-                />
-                <Typography
-                  type={TypographyType.Caption1}
-                  color={
-                    fieldState.error
-                      ? TypographyColor.StatusError
-                      : TypographyColor.Tertiary
-                  }
-                >
-                  {fieldState.error?.message ?? (
-                    <>
-                      {[scheduleDelta, `Timezone: ${timezoneLabel}`]
-                        .filter(Boolean)
-                        .join(' · ')}
-                      {' · '}
-                      <Link href={timezoneSettingsUrl} passHref>
-                        <a className="text-text-link">Change timezone</a>
-                      </Link>
-                    </>
-                  )}
-                </Typography>
-              </div>
-            )}
-          />
-        ) : null}
-        <Controller
-          control={form.control}
-          name="description"
-          render={({ field, fieldState }) => (
-            <div className="flex flex-col gap-1">
-              <Typography type={TypographyType.Footnote} bold>
-                Description{' '}
-                <Typography
-                  tag={TypographyTag.Span}
-                  type={TypographyType.Footnote}
-                  color={TypographyColor.Tertiary}
-                >
-                  (optional)
-                </Typography>
-              </Typography>
-              <RichTextInput
-                initialContent={field.value ?? ''}
-                maxInputLength={DESCRIPTION_MAX_LENGTH}
-                onValueUpdate={field.onChange}
-                minHeightClassName="min-h-[8rem]"
-                textareaProps={{
-                  name: field.name,
-                  'aria-label': 'Description',
-                  placeholder:
-                    'Add context, drop daily.dev posts to react to, or jot down questions for the room. Shown in the lobby while people RSVP, and in the Agenda tab once the standup is live.',
-                  maxLength: DESCRIPTION_MAX_LENGTH,
-                }}
-                className={{
-                  container: fieldState.error
-                    ? 'border border-status-error'
-                    : '',
-                }}
-              />
-              <Typography
-                type={TypographyType.Caption1}
-                color={
-                  fieldState.error
-                    ? TypographyColor.StatusError
-                    : TypographyColor.Quaternary
-                }
-              >
-                {fieldState.error?.message ??
-                  'Supports rich text, markdown shortcuts, and daily.dev post embeds.'}
-              </Typography>
-            </div>
-          )}
-        />
-        <div className="mt-2 hidden items-center justify-end gap-3 laptop:flex">
-          <Typography
-            type={TypographyType.Caption1}
-            color={TypographyColor.Tertiary}
-            className="min-w-0 flex-1"
-          >
-            {isScheduled
-              ? "We'll open the lobby right away and share a post on your feed so people can RSVP. You can go live at the scheduled time."
-              : "You'll be asked for camera and microphone access before going live."}
-          </Typography>
-          <Button
-            type="submit"
-            variant={ButtonVariant.Primary}
-            loading={isPending}
-          >
-            {submitCopy}
-          </Button>
-        </div>
-      </form>
-    </FormProvider>
-  );
-};
-
-export default CreateLiveRoomForm;
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 39fa4e2722c..07dffc5d7bf 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -10,6 +10,8 @@ import { useNotificationToggle } from '../../../hooks/notifications';
 import { useComposerAudience } from '../../post/composer/useComposerAudience';
 import { useComposerSubmit } from '../../post/composer/useComposerSubmit';
 import { LogEvent } from '../../../lib/log';
+import type { Post } from '../../../graphql/posts';
+import { PostType } from '../../../graphql/posts';
 import { SmartComposerModal } from './SmartComposerModal';
 
 jest.mock('../../../contexts/AuthContext', () => ({
@@ -285,4 +287,81 @@ describe('SmartComposerModal', () => {
     });
     expect(schedule.parentElement).not.toBe(scheduledNav.parentElement);
   });
+
+  describe('editing a share post', () => {
+    const sharedPost = {
+      title: 'The shared article',
+      permalink: 'https://daily.dev/posts/shared',
+    };
+    const editShare = {
+      id: 'post-1',
+      type: PostType.Share,
+      title: 'My take on this',
+      sharedPost,
+      source: { id: 'squad-1' },
+    } as unknown as Post;
+
+    it('opens on the link kind rather than defaulting to text', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('My take on this');
+    });
+
+    it('locks the link, since only the commentary is editable', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.queryByRole('textbox', { name: 'Link URL' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: 'Remove link preview' }),
+      ).not.toBeInTheDocument();
+    });
+
+    it('seeds the preview from the post instead of refetching it', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.initialPreview).toBe(sharedPost);
+      expect(hookProps?.editPostId).toBe('post-1');
+    });
+
+    it('offers an empty commentary when the share never had one', () => {
+      // A share posted without commentary carries the shared post's title,
+      // which is not the author's words and must not be presented as theirs.
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={
+            { ...editShare, title: sharedPost.title } as unknown as Post
+          }
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('');
+    });
+  });
 });
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index 08ccc8d76bb..ae4df1bcf5e 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -36,6 +36,7 @@ import { LogEvent } from '../../../lib/log';
 import { useViewSize, ViewSize } from '../../../hooks';
 import { usePrompt } from '../../../hooks/usePrompt';
 import type { ExternalLinkPreview, Post } from '../../../graphql/posts';
+import { PostType } from '../../../graphql/posts';
 import type { Squad } from '../../../graphql/sources';
 import { getPostByIdKey } from '../../../lib/query';
 import { moderationRequired } from '../../squads/utils';
@@ -132,7 +133,7 @@ export function SmartComposerModal({
   const isEditing = !!editPost;
   const [kind, setKind] = useState<ComposerKind>(() => {
     if (isEditing) {
-      return 'text';
+      return editPost.type === PostType.Share ? 'link' : 'text';
     }
     if (initialUrl) {
       return 'link';
@@ -175,10 +176,34 @@ export function SmartComposerModal({
       body: initialContent ?? DEFAULT_TEXT.body,
     };
   });
-  const [link, setLink] = useState<LinkFormState>({
-    ...DEFAULT_LINK,
-    url: initialUrl ?? '',
-    commentary: initialCommentary ?? DEFAULT_LINK.commentary,
+  const editShare = editPost?.type === PostType.Share ? editPost : undefined;
+  // A share posted without commentary carries the shared post's own title,
+  // which is not the author's text and must not be offered back to them as if
+  // it were.
+  const editShareCommentary = ((): string => {
+    if (!editShare) {
+      return '';
+    }
+    if (!editShare.sharedPost) {
+      return editShare.content ?? '';
+    }
+    return editShare.title === editShare.sharedPost.title
+      ? ''
+      : editShare.title ?? '';
+  })();
+  const [link, setLink] = useState<LinkFormState>(() => {
+    if (editShare) {
+      return {
+        ...DEFAULT_LINK,
+        url: editShare.sharedPost?.permalink ?? '',
+        commentary: editShareCommentary,
+      };
+    }
+    return {
+      ...DEFAULT_LINK,
+      url: initialUrl ?? '',
+      commentary: initialCommentary ?? DEFAULT_LINK.commentary,
+    };
   });
   const [poll, setPoll] = useState<PollFormState>(DEFAULT_POLL);
   const [standup, setStandup] = useState<StandupFormState>(DEFAULT_STANDUP);
@@ -191,6 +216,9 @@ export function SmartComposerModal({
   useDisableSpotlightShortcut();
 
   const isDirty = useMemo(() => {
+    if (editShare) {
+      return link.commentary !== editShareCommentary;
+    }
     if (editPost) {
       if (text.title !== (editPost.title ?? '')) {
         return true;
@@ -222,7 +250,16 @@ export function SmartComposerModal({
       return true;
     }
     return false;
-  }, [cover, text, link, poll, standup, editPost]);
+  }, [
+    cover,
+    text,
+    link,
+    poll,
+    standup,
+    editPost,
+    editShare,
+    editShareCommentary,
+  ]);
 
   const confirmDiscardIfDirty = useCallback(async () => {
     if (!isDirty) {
@@ -365,7 +402,9 @@ export function SmartComposerModal({
     primary,
     selectedIds,
     isMulti,
-    initialPreview,
+    // Editing a share has no URL to resolve, so seed the preview with the
+    // post's own shared content instead of fetching one.
+    initialPreview: editShare?.sharedPost ?? initialPreview,
     editPostId: editPost?.id,
     resolveScheduledAt: canSchedule ? schedule.resolveScheduledAt : undefined,
     onComplete: () => {
@@ -619,6 +658,7 @@ export function SmartComposerModal({
                 logEvent({ event_name: LogEvent.DismissComposerPreview })
               }
               initialUrl={initialUrl ? link.url : undefined}
+              isUrlLocked={!!editShare}
             />
           )}
           {kind === 'poll' && <PollForm value={poll} onChange={setPoll} />}
diff --git a/packages/shared/src/components/post/composer/LinkForm.spec.tsx b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
index 13daaee41e7..bc7ad494945 100644
--- a/packages/shared/src/components/post/composer/LinkForm.spec.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
@@ -28,9 +28,13 @@ jest.mock('../write/WritePreviewSkeleton', () => ({
 const renderLinkForm = ({
   initialValue = DEFAULT_LINK,
   onSubmit = jest.fn(),
+  isUrlLocked = false,
+  preview,
 }: {
   initialValue?: LinkFormState;
   onSubmit?: jest.Mock;
+  isUrlLocked?: boolean;
+  preview?: { url: string; title: string };
 } = {}) => {
   const fetchPreview = jest.fn();
 
@@ -48,6 +52,8 @@ const renderLinkForm = ({
           value={value}
           onChange={setValue}
           fetchPreview={fetchPreview}
+          isUrlLocked={isUrlLocked}
+          preview={preview}
         />
         <button type="submit">Post</button>
       </form>
@@ -56,7 +62,7 @@ const renderLinkForm = ({
 
   render(<FormHarness />);
 
-  return { onSubmit };
+  return { onSubmit, fetchPreview };
 };
 
 describe('LinkForm', () => {
@@ -136,4 +142,37 @@ describe('LinkForm', () => {
     expect(notPrevented).toBe(false);
     expect(onSubmit).not.toHaveBeenCalled();
   });
+
+  describe('with a locked URL', () => {
+    const lockedProps = {
+      isUrlLocked: true,
+      initialValue: { url: 'https://daily.dev/posts/shared', commentary: 'hi' },
+      preview: { url: 'https://daily.dev/posts/shared', title: 'Shared' },
+    };
+
+    it('drops the URL field and the preview remove button', () => {
+      renderLinkForm(lockedProps);
+
+      expect(
+        screen.queryByRole('textbox', { name: 'Link URL' }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.queryByRole('button', { name: 'Remove link preview' }),
+      ).not.toBeInTheDocument();
+    });
+
+    it('starts in the commentary, the only field left to edit', () => {
+      renderLinkForm(lockedProps);
+
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveFocus();
+    });
+
+    it('never refetches a preview for a link that cannot change', () => {
+      const { fetchPreview } = renderLinkForm(lockedProps);
+
+      expect(fetchPreview).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/packages/shared/src/components/post/composer/LinkForm.tsx b/packages/shared/src/components/post/composer/LinkForm.tsx
index cc9da570f49..ed606377cd7 100644
--- a/packages/shared/src/components/post/composer/LinkForm.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.tsx
@@ -23,6 +23,11 @@ interface LinkFormProps {
   fetchPreview: (url?: string) => void;
   onDismissPreview?: () => void;
   initialUrl?: string;
+  /**
+   * Editing an existing share: the link itself is fixed, so the URL field and
+   * the preview's remove button are dropped and only the commentary is open.
+   */
+  isUrlLocked?: boolean;
 }
 
 export const LinkForm = ({
@@ -33,14 +38,19 @@ export const LinkForm = ({
   fetchPreview,
   onDismissPreview,
   initialUrl,
+  isUrlLocked = false,
 }: LinkFormProps): ReactElement => {
   const urlRef = useRef<HTMLInputElement>(null);
   const commentaryRef = useRef<HTMLTextAreaElement>(null);
   const [dismissedUrl, setDismissedUrl] = useState<string | null>(null);
 
   useEffect(() => {
+    if (isUrlLocked) {
+      commentaryRef.current?.focus();
+      return;
+    }
     urlRef.current?.focus();
-  }, []);
+  }, [isUrlLocked]);
 
   const hasPreviewForUrl = useCallback(
     (next?: string): boolean =>
@@ -70,9 +80,13 @@ export const LinkForm = ({
     onDismissPreview?.();
   };
 
+  // A locked link is the post's own shared content, so it is always the right
+  // preview to show — there is no URL being typed for it to race against.
   const showPreview =
-    isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl;
-  const showSkeleton = isLoadingPreview && !isDismissedForCurrentUrl;
+    isUrlLocked ||
+    (isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl);
+  const showSkeleton =
+    !isUrlLocked && isLoadingPreview && !isDismissedForCurrentUrl;
 
   useAutoResizeTextarea(commentaryRef, value.commentary);
 
@@ -94,33 +108,35 @@ export const LinkForm = ({
   );
 
   useEffect(() => {
-    if (!initialUrl) {
+    if (!initialUrl || isUrlLocked) {
       return;
     }
 
     onUrlChangeRef.current(initialUrl);
-  }, [initialUrl]);
+  }, [initialUrl, isUrlLocked]);
 
   return (
     <div className="flex flex-1 flex-col gap-3">
-      <input
-        ref={urlRef}
-        type="text"
-        name="url"
-        inputMode="url"
-        autoComplete="url"
-        autoCapitalize="none"
-        autoCorrect="off"
-        spellCheck={false}
-        placeholder="Paste a link…"
-        value={value.url}
-        onInput={(event) => {
-          onUrlChange(event.currentTarget.value);
-        }}
-        onKeyDown={onEnterKeyDown}
-        aria-label="Link URL"
-        className="w-full bg-transparent font-bold leading-tight text-text-primary outline-none typo-title2 placeholder:text-text-quaternary"
-      />
+      {!isUrlLocked && (
+        <input
+          ref={urlRef}
+          type="text"
+          name="url"
+          inputMode="url"
+          autoComplete="url"
+          autoCapitalize="none"
+          autoCorrect="off"
+          spellCheck={false}
+          placeholder="Paste a link…"
+          value={value.url}
+          onInput={(event) => {
+            onUrlChange(event.currentTarget.value);
+          }}
+          onKeyDown={onEnterKeyDown}
+          aria-label="Link URL"
+          className="w-full bg-transparent font-bold leading-tight text-text-primary outline-none typo-title2 placeholder:text-text-quaternary"
+        />
+      )}
       <textarea
         ref={commentaryRef}
         name="commentary"
@@ -152,21 +168,23 @@ export const LinkForm = ({
             <WriteLinkPreview
               className="!w-auto flex-col-reverse"
               preview={preview}
-              link={normalizedUrl}
+              link={normalizedUrl || value.url}
               showPreviewLink={false}
             />
           )}
-          <Tooltip content="Remove link preview">
-            <Button
-              type="button"
-              size={ButtonSize.Small}
-              variant={ButtonVariant.Primary}
-              icon={<MiniCloseIcon />}
-              onClick={dismissPreview}
-              aria-label="Remove link preview"
-              className="absolute right-3 top-3 z-1 !rounded-full !bg-surface-invert !text-text-primary !shadow-3 hover:!bg-text-primary hover:!text-surface-invert"
-            />
-          </Tooltip>
+          {!isUrlLocked && (
+            <Tooltip content="Remove link preview">
+              <Button
+                type="button"
+                size={ButtonSize.Small}
+                variant={ButtonVariant.Primary}
+                icon={<MiniCloseIcon />}
+                onClick={dismissPreview}
+                aria-label="Remove link preview"
+                className="absolute right-3 top-3 z-1 !rounded-full !bg-surface-invert !text-text-primary !shadow-3 hover:!bg-text-primary hover:!text-surface-invert"
+              />
+            </Tooltip>
+          )}
         </div>
       )}
     </div>
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
new file mode 100644
index 00000000000..2aba907e156
--- /dev/null
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
@@ -0,0 +1,108 @@
+import { renderHook, act } from '@testing-library/react';
+import type { FormEvent } from 'react';
+import { usePostToSquad } from '../../../hooks';
+import type { Squad } from '../../../graphql/sources';
+import { DEFAULT_LINK, DEFAULT_POLL, DEFAULT_TEXT } from './types';
+import { useComposerSubmit } from './useComposerSubmit';
+
+const mockOnUpdateSharePost = jest.fn();
+const mockOnSubmitPost = jest.fn();
+const mockDisplayToast = jest.fn();
+
+jest.mock('../../../hooks', () => {
+  const actual = jest.requireActual('../../../hooks');
+
+  return {
+    ...actual,
+    usePostToSquad: jest.fn(),
+  };
+});
+
+jest.mock('../../../hooks/useToastNotification', () => ({
+  useToastNotification: () => ({ displayToast: mockDisplayToast }),
+}));
+
+jest.mock('next/router', () => ({
+  useRouter: () => ({ push: jest.fn() }),
+}));
+
+jest.mock('../../../contexts/AuthContext', () => ({
+  useAuthContext: () => ({ user: { id: 'u1', username: 'me' } }),
+}));
+
+jest.mock('../../../hooks/liveRooms/useSubmitStandup', () => ({
+  useSubmitStandup: () => ({ submit: jest.fn(), isPending: false }),
+}));
+
+jest.mock('../../../features/squads/hooks/useMultipleSourcePost', () => ({
+  useMultipleSourcePost: () => ({ onCreate: jest.fn(), isPending: false }),
+}));
+
+const squad = { id: 'squad-1', handle: 'squad' } as Squad;
+
+const renderSubmit = (overrides = {}) =>
+  renderHook(() =>
+    useComposerSubmit({
+      kind: 'link',
+      text: DEFAULT_TEXT,
+      link: { ...DEFAULT_LINK, commentary: '  updated take  ' },
+      poll: DEFAULT_POLL,
+      standup: { topic: '', description: '' },
+      cover: null,
+      primary: squad,
+      selectedIds: ['squad-1'],
+      isMulti: false,
+      onComplete: jest.fn(),
+      editPostId: 'post-1',
+      ...overrides,
+    } as unknown as Parameters<typeof useComposerSubmit>[0]),
+  );
+
+describe('useComposerSubmit editing a share', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.mocked(usePostToSquad).mockReturnValue({
+      getLinkPreview: jest.fn(),
+      isLoadingPreview: false,
+      preview: undefined,
+      isPosting: false,
+      onSubmitPost: mockOnSubmitPost,
+      onSubmitFreeformPost: jest.fn(),
+      onEditFreeformPost: jest.fn(),
+      onSubmitPollPost: jest.fn(),
+      onUpdateSharePost: mockOnUpdateSharePost,
+    } as unknown as ReturnType<typeof usePostToSquad>);
+  });
+
+  it('updates the existing share instead of posting a new one', async () => {
+    const { result } = renderSubmit();
+
+    await act(async () => {
+      await result.current.handleSubmit({
+        preventDefault: jest.fn(),
+      } as unknown as FormEvent<HTMLFormElement>);
+    });
+
+    expect(mockOnUpdateSharePost).toHaveBeenCalledWith(
+      expect.anything(),
+      'post-1',
+      'updated take',
+      squad,
+    );
+    expect(mockOnSubmitPost).not.toHaveBeenCalled();
+  });
+
+  it('stays submittable without a resolved preview', () => {
+    // The link is fixed while editing, so there is no URL/preview pair to
+    // validate — requiring one left the Post button permanently disabled.
+    const { result } = renderSubmit();
+
+    expect(result.current.isSubmitDisabled).toBe(false);
+  });
+
+  it('still requires a valid preview when creating', () => {
+    const { result } = renderSubmit({ editPostId: undefined });
+
+    expect(result.current.isSubmitDisabled).toBe(true);
+  });
+});
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.ts b/packages/shared/src/components/post/composer/useComposerSubmit.ts
index 1404f42188d..4bc700b4f6c 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.ts
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.ts
@@ -116,6 +116,7 @@ export const useComposerSubmit = ({
     onSubmitFreeformPost,
     onEditFreeformPost,
     onSubmitPollPost,
+    onUpdateSharePost,
   } = usePostToSquad({
     initialPreview,
     onComplete,
@@ -178,7 +179,9 @@ export const useComposerSubmit = ({
       return !isTextValid(text);
     }
     if (kind === 'link') {
-      return !isLinkValid(link, preview);
+      // Editing keeps the original link, so the URL/preview pair it would
+      // normally validate is not in play.
+      return editPostId ? false : !isLinkValid(link, preview);
     }
     return !isPollValid(poll);
   };
@@ -252,6 +255,22 @@ export const useComposerSubmit = ({
     event: FormEvent<HTMLFormElement>,
     scheduledAt?: string,
   ) => {
+    if (editPostId) {
+      // Only the commentary is editable on a share — the link it points at is
+      // fixed, so there is no preview to re-resolve first.
+      await onUpdateSharePost(
+        event,
+        editPostId,
+        link.commentary.trim(),
+        primary as Squad,
+      );
+      // The plain update path toasts from usePostToSquad; the moderation one
+      // completes silently, so it is the only case that needs confirming here.
+      if (moderationRequired(primary as Squad)) {
+        displayToast('✅ Your edit has been submitted for moderation');
+      }
+      return;
+    }
     if (!isPreviewForComposerUrl(preview, link.url)) {
       displayToast('Invalid link');
       return;
diff --git a/packages/shared/src/components/post/poll/CreatePoll.tsx b/packages/shared/src/components/post/poll/CreatePoll.tsx
deleted file mode 100644
index 34e144fc143..00000000000
--- a/packages/shared/src/components/post/poll/CreatePoll.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { FormEventHandler } from 'react';
-import React, { useEffect, useImperativeHandle, useRef } from 'react';
-import { WritePageMain } from '../freeform';
-import { TextField } from '../../fields/TextField';
-import { useWritePostContext } from '../../../contexts';
-import { Typography, TypographyType } from '../../typography/Typography';
-import { WriteFooter } from '../write';
-import { Button, ButtonVariant } from '../../buttons/Button';
-import { PlusIcon } from '../../icons';
-import { ActionType } from '../../../graphql/actions';
-import { useActions } from '../../../hooks';
-import { formToJson } from '../../../lib/form';
-import { PostType } from '../../../types';
-import useDebounceFn from '../../../hooks/useDebounceFn';
-
-const MAX_TITLE_LENGTH = 250;
-const MAX_OPTION_LENGTH = 35;
-
-const CreatePoll = () => {
-  const {
-    onSubmitForm,
-    isPosting,
-    draft,
-    isUpdatingDraft,
-    updateDraft,
-    formRef: propRef,
-  } = useWritePostContext();
-  const formRef = useRef<HTMLFormElement>();
-  useImperativeHandle(propRef, () => formRef?.current);
-  const { completeAction } = useActions();
-
-  const onAddOption = () => {
-    const opts = draft?.options || [];
-    updateDraft({
-      ...draft,
-      options: [...opts, ''],
-    });
-  };
-
-  const handleTitle = (value: string) => {
-    updateDraft({
-      ...draft,
-      title: value,
-    });
-  };
-
-  const handleOption = (value: string, index: number) => {
-    const newOpts = draft?.options?.map((opt, i) =>
-      i === index ? value : opt,
-    );
-    updateDraft({
-      ...draft,
-      options: newOpts,
-    });
-  };
-
-  useEffect(() => {
-    if (!isUpdatingDraft && !draft?.options) {
-      updateDraft({
-        ...draft,
-        options: ['', ''],
-        duration: 7,
-      });
-    }
-  }, [draft, updateDraft, isUpdatingDraft]);
-
-  const handleSubmit: FormEventHandler<HTMLFormElement> = async (e) => {
-    e.preventDefault();
-    completeAction(ActionType.WritePost);
-    const {
-      title,
-      options,
-      duration,
-    }: {
-      title: string;
-      options: string[];
-      duration?: number;
-    } = formToJson(e.currentTarget);
-
-    onSubmitForm(
-      e,
-      {
-        title,
-        options,
-        duration: duration ? Number(duration) : undefined,
-        content: '',
-        image: undefined,
-      },
-      PostType.Poll,
-    );
-  };
-
-  const [onUpdateTitle] = useDebounceFn(handleTitle, 3000);
-  const [onOptionUpdate] = useDebounceFn(
-    ({ value, index }) => handleOption(value, index),
-    3000,
-  );
-
-  return (
-    <WritePageMain
-      onSubmit={handleSubmit}
-      className="gap-4"
-      ref={formRef}
-      id="write-post-poll"
-    >
-      <TextField
-        className={{ container: 'w-full' }}
-        inputId="title"
-        name="title"
-        label="Ask a question*"
-        required
-        defaultValue={draft?.title || ''}
-        onInput={(e) => onUpdateTitle(e.currentTarget.value)}
-        maxLength={MAX_TITLE_LENGTH}
-      />
-      <div className="flex flex-col gap-2">
-        <Typography type={TypographyType.Body} bold>
-          Poll options
-        </Typography>
-        {draft?.options?.map((option, index) => (
-          <TextField
-            key={`option-${index + 1}`}
-            className={{ container: 'w-full' }}
-            inputId={`options-${index}`}
-            name="options[]"
-            label={`Option ${index + 1}${index <= 1 ? '*' : ' (optional)'}`}
-            required={index <= 1}
-            defaultValue={option || ''}
-            onInput={(e) =>
-              onOptionUpdate({ value: e.currentTarget.value, index })
-            }
-            onBlur={(e) => handleOption(e.currentTarget.value, index)}
-            maxLength={MAX_OPTION_LENGTH}
-          />
-        ))}
-        {draft?.options && draft?.options.length < 4 && (
-          <Button
-            type="button"
-            icon={<PlusIcon />}
-            onClick={onAddOption}
-            variant={ButtonVariant.Subtle}
-          >
-            Add option
-          </Button>
-        )}
-      </div>
-      <WriteFooter isLoading={isPosting} isPoll />
-    </WritePageMain>
-  );
-};
-
-export default CreatePoll;
diff --git a/packages/shared/src/features/posts/PostOptionButton.tsx b/packages/shared/src/features/posts/PostOptionButton.tsx
index 574f5db2a96..f3a2733d6aa 100644
--- a/packages/shared/src/features/posts/PostOptionButton.tsx
+++ b/packages/shared/src/features/posts/PostOptionButton.tsx
@@ -801,8 +801,12 @@ const PostOptionButtonContent = ({
         icon: <MenuIcon Icon={EditIcon} />,
         label: 'Edit post',
         action: () => {
+          // Moderation items keep the dedicated page: it edits a pending
+          // submission rather than a post, which the composer cannot do.
           const canUseSmartComposer =
-            post.type === PostType.Freeform || post.type === PostType.Welcome;
+            post.type === PostType.Freeform ||
+            post.type === PostType.Welcome ||
+            post.type === PostType.Share;
           if (canUseSmartComposer) {
             openModal({
               type: LazyModal.SmartComposer,

From 43ab801d9534aaa1690dff0a6f243d4b7bcd0dd1 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 4 Aug 2026 14:42:49 +0300
Subject: [PATCH 02/12] feat(composer): share to squad through the new composer

Squad share triggers (ShareBar, DiscussionShareRow, Share modal) now open
SmartComposerModal seeded with the post as the link preview and the squad
preselected, replacing CreateSharedPostModal. The composer's link flow
already covers internal shares (preview.id -> addPostToSquad, moderation,
multi-squad via sharedPostId), so the old modal is deleted along with its
lazy-modal registration. A new onPosted callback carries the ShareToSquad
analytics event that the old modal's onSharedSuccessfully used to fire.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shared/src/components/ShareBar.spec.tsx   |  21 +-
 packages/shared/src/components/ShareBar.tsx   |   8 +-
 .../shared/src/components/modals/common.tsx   |   8 -
 .../src/components/modals/common/types.ts     |   1 -
 .../post/CreateSharedPostModal.spec.tsx       |  90 ---------
 .../modals/post/CreateSharedPostModal.tsx     | 179 ------------------
 .../modals/post/SmartComposerModal.spec.tsx   |  51 +++++
 .../modals/post/SmartComposerModal.tsx        |   3 +
 .../post/focus/DiscussionShareRow.tsx         |   8 +-
 .../src/components/widgets/SocialShare.tsx    |  22 ++-
 10 files changed, 90 insertions(+), 301 deletions(-)
 delete mode 100644 packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx
 delete mode 100644 packages/shared/src/components/modals/post/CreateSharedPostModal.tsx

diff --git a/packages/shared/src/components/ShareBar.spec.tsx b/packages/shared/src/components/ShareBar.spec.tsx
index 275c4e34b4c..7daee6962c2 100644
--- a/packages/shared/src/components/ShareBar.spec.tsx
+++ b/packages/shared/src/components/ShareBar.spec.tsx
@@ -12,6 +12,8 @@ import { generateTestSquad } from '../../__tests__/fixture/squads';
 import { getFacebookShareLink, getTwitterShareLink } from '../lib/share';
 import { LazyModalElement } from './modals/LazyModalElement';
 import { NotificationsContextProvider } from '../contexts/NotificationsContext';
+import SettingsContext from '../contexts/SettingsContext';
+import { settingsContext } from '../../__tests__/helpers/boot';
 
 const defaultPost = Post;
 Object.defineProperty(window, 'matchMedia', {
@@ -65,10 +67,12 @@ const renderComponent = (
         loadedUserFromCache
         squads={customSquads}
       >
-        <NotificationsContextProvider>
-          <LazyModalElement />
-          <ShareBar post={post} />
-        </NotificationsContextProvider>
+        <SettingsContext.Provider value={settingsContext}>
+          <NotificationsContextProvider>
+            <LazyModalElement />
+            <ShareBar post={post} />
+          </NotificationsContextProvider>
+        </SettingsContext.Provider>
       </AuthContextProvider>
     </QueryClientProvider>,
   );
@@ -113,15 +117,20 @@ describe('ShareBar Test Suite:', () => {
     });
   });
 
-  it('should render the component with logged user and squads and open the share to squad modal', async () => {
+  it('should render the component with logged user and squads and open the share to squad composer', async () => {
     renderComponent();
     const btn = await screen.findByTestId(`social-share-@${squads[0].handle}`);
 
     expect(btn).toBeInTheDocument();
     btn.click();
     await waitFor(() => {
-      expect(screen.getByText('New post')).toBeInTheDocument();
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toBeInTheDocument();
     });
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
   });
 
   it('should render the Facebook button and navigate to correct link', async () => {
diff --git a/packages/shared/src/components/ShareBar.tsx b/packages/shared/src/components/ShareBar.tsx
index 6b9461f11cf..6044ec84af3 100644
--- a/packages/shared/src/components/ShareBar.tsx
+++ b/packages/shared/src/components/ShareBar.tsx
@@ -79,12 +79,12 @@ export default function ShareBar({ post }: ShareBarProps): ReactElement {
   const onShareToSquad = (squad: Squad) => {
     logEvent(postLogEvent(LogEvent.StartShareToSquad, post));
     openModal({
-      type: LazyModal.CreateSharedPost,
+      type: LazyModal.SmartComposer,
       props: {
-        squad,
+        initialUrl: post.permalink,
         preview: post,
-        onSharedSuccessfully: () =>
-          logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
+        initialSquadId: squad.id,
+        onPosted: () => logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
       },
     });
   };
diff --git a/packages/shared/src/components/modals/common.tsx b/packages/shared/src/components/modals/common.tsx
index 56849f3a97d..ffa08eb1f0b 100644
--- a/packages/shared/src/components/modals/common.tsx
+++ b/packages/shared/src/components/modals/common.tsx
@@ -41,13 +41,6 @@ const ReadingHistoryModal = dynamic(
     ),
 );
 
-const CreateSharedPostModal = dynamic(
-  () =>
-    import(
-      /* webpackChunkName: "createSharedPostModal" */ './post/CreateSharedPostModal'
-    ),
-);
-
 const SmartComposerModal = dynamic(
   () =>
     import(
@@ -533,7 +526,6 @@ export const modals = {
   [LazyModal.SquadTour]: SquadTourModal,
   [LazyModal.ReadingHistory]: ReadingHistoryModal,
   [LazyModal.SquadPromotion]: SquadPromotionModal,
-  [LazyModal.CreateSharedPost]: CreateSharedPostModal,
   [LazyModal.SmartComposer]: SmartComposerModal,
   [LazyModal.ReportPost]: ReportPostModal,
   [LazyModal.ReportComment]: ReportCommentModal,
diff --git a/packages/shared/src/components/modals/common/types.ts b/packages/shared/src/components/modals/common/types.ts
index 66e87110334..34fbf8ac0b2 100644
--- a/packages/shared/src/components/modals/common/types.ts
+++ b/packages/shared/src/components/modals/common/types.ts
@@ -31,7 +31,6 @@ export enum LazyModal {
   RepostsPopup = 'repostsPopup',
   ReadingHistory = 'readingHistory',
   SquadPromotion = 'squadPromotion',
-  CreateSharedPost = 'createSharedPost',
   SmartComposer = 'smartComposer',
   ReasonSelection = 'reasonSelection',
   ReportPost = 'reportPost',
diff --git a/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx b/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx
deleted file mode 100644
index 1b429f3ec0b..00000000000
--- a/packages/shared/src/components/modals/post/CreateSharedPostModal.spec.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import { CreateSharedPostModal } from './CreateSharedPostModal';
-import { usePostToSquad } from '../../../hooks';
-import { useNotificationToggle } from '../../../hooks/notifications';
-
-jest.mock('../../../hooks', () => ({
-  ...(jest.requireActual('../../../hooks') as Iterable<unknown>),
-  usePostToSquad: jest.fn(),
-}));
-
-jest.mock('../../../hooks/notifications', () => ({
-  useNotificationToggle: jest.fn(),
-}));
-
-jest.mock('../common/Modal', () => {
-  const MockModal = ({ children }: React.PropsWithChildren) => (
-    <div>{children}</div>
-  );
-  const MockModalHeader = () => null;
-  const MockModalFooter = ({ children }: React.PropsWithChildren) => (
-    <div>{children}</div>
-  );
-
-  MockModal.Kind = { FlexibleCenter: 'FlexibleCenter' };
-  MockModal.Size = { Medium: 'Medium' };
-  MockModal.Header = MockModalHeader;
-  MockModal.Footer = MockModalFooter;
-
-  return {
-    Modal: MockModal,
-  };
-});
-
-jest.mock('../../fields/RichTextInput', () => {
-  const { forwardRef } = jest.requireActual('react') as typeof React;
-
-  return forwardRef(() => null);
-});
-jest.mock('../../post/write', () => ({
-  WriteLinkPreview: () => null,
-  WritePreviewSkeleton: () => null,
-}));
-jest.mock('../../cards/common/SourceButton', () => () => null);
-
-describe('CreateSharedPostModal', () => {
-  const onRequestClose = jest.fn();
-  const onSharedSuccessfully = jest.fn();
-  const onSubmitted = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    jest.mocked(useNotificationToggle).mockReturnValue({
-      shouldShowCta: false,
-      isEnabled: false,
-      onToggle: jest.fn(),
-      onSubmitted,
-    } as unknown as ReturnType<typeof useNotificationToggle>);
-    jest.mocked(usePostToSquad).mockReturnValue({
-      getLinkPreview: jest.fn(),
-      isLoadingPreview: false,
-      preview: {},
-      isPosting: false,
-      onSubmitPost: jest.fn(),
-    } as unknown as ReturnType<typeof usePostToSquad>);
-  });
-
-  it('closes the modal from the shared completion callback', () => {
-    render(
-      <CreateSharedPostModal
-        isOpen
-        preview={{ url: 'https://daily.dev/post' }}
-        squad={{ id: 'squad-1', name: 'Squad', handle: 'squad' } as never}
-        onRequestClose={onRequestClose}
-        onSharedSuccessfully={onSharedSuccessfully}
-      />,
-    );
-
-    const hookProps = jest.mocked(usePostToSquad).mock.calls[0]?.[0];
-
-    expect(hookProps?.onComplete).toBeDefined();
-
-    hookProps?.onComplete?.();
-
-    expect(onSharedSuccessfully).toHaveBeenCalledTimes(1);
-    expect(onSubmitted).toHaveBeenCalledTimes(1);
-    expect(onRequestClose).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx b/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx
deleted file mode 100644
index 1521a7fc3c0..00000000000
--- a/packages/shared/src/components/modals/post/CreateSharedPostModal.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import type { FormEventHandler, ReactElement } from 'react';
-import React, { useRef, useState } from 'react';
-import type { LazyModalCommonProps } from '../common/Modal';
-import { Modal } from '../common/Modal';
-import type { ExternalLinkPreview } from '../../../graphql/posts';
-import type { RichTextInputRef } from '../../fields/RichTextInput';
-import RichTextInput from '../../fields/RichTextInput';
-import { WriteLinkPreview, WritePreviewSkeleton } from '../../post/write';
-import { usePostToSquad } from '../../../hooks';
-import {
-  Button,
-  ButtonColor,
-  ButtonSize,
-  ButtonVariant,
-} from '../../buttons/Button';
-import { AtIcon } from '../../icons';
-import { Divider, Justify } from '../../utilities';
-import SourceButton from '../../cards/common/SourceButton';
-import type { Squad } from '../../../graphql/sources';
-import { formToJson } from '../../../lib/form';
-import { useDebouncedUrl } from '../../../hooks/input';
-import { useNotificationToggle } from '../../../hooks/notifications';
-import { Switch } from '../../fields/Switch';
-import { ProfileImageSize } from '../../ProfilePicture';
-
-export interface CreateSharedPostModalProps extends LazyModalCommonProps {
-  preview: ExternalLinkPreview;
-  onSharedSuccessfully?: (enableNotification?: boolean) => void;
-  squad: Squad;
-}
-
-export function CreateSharedPostModal({
-  preview,
-  squad,
-  onSharedSuccessfully,
-  onRequestClose,
-  ...props
-}: CreateSharedPostModalProps): ReactElement {
-  const richTextRef = useRef<RichTextInputRef | null>(null);
-  const [link, setLink] = useState(preview?.permalink ?? preview?.url ?? '');
-  const { shouldShowCta, isEnabled, onToggle, onSubmitted } =
-    useNotificationToggle();
-  const onSuccess = () => {
-    onSharedSuccessfully?.();
-    onSubmitted();
-    onRequestClose();
-  };
-  const {
-    getLinkPreview,
-    isLoadingPreview,
-    preview: updatedPreview,
-    isPosting,
-    onSubmitPost,
-  } = usePostToSquad({
-    initialPreview: preview,
-    onComplete: onSuccess,
-  });
-
-  const onFormSubmit: FormEventHandler<HTMLFormElement> = (e) => {
-    e.preventDefault();
-
-    const { commentary } = formToJson<{ commentary: string }>(e.currentTarget);
-    return onSubmitPost(e, squad, commentary);
-  };
-
-  const links = [updatedPreview?.url, updatedPreview?.permalink];
-  const [checkUrl] = useDebouncedUrl(
-    (value) => {
-      if (!value) {
-        return undefined;
-      }
-
-      return getLinkPreview(value);
-    },
-    (value) => links.every((url) => url !== value),
-  );
-
-  const onInput: FormEventHandler<HTMLInputElement> = (e) => {
-    const { value } = e.currentTarget;
-    setLink(value);
-    checkUrl(value);
-  };
-
-  const footer = (
-    <>
-      <Button
-        icon={<AtIcon />}
-        size={ButtonSize.Small}
-        variant={ButtonVariant.Tertiary}
-        onClick={richTextRef?.current?.onMentionCommand}
-      />
-      <Divider vertical />
-      <SourceButton source={squad} size={ProfileImageSize.Small} />
-      <span className="-ml-1 flex-1">
-        <strong>{squad.name}</strong>
-        <span className="ml-1 text-text-tertiary">@{squad.handle}</span>
-      </span>
-    </>
-  );
-
-  const submitProps = {
-    color: ButtonColor.Cabbage,
-    variant: ButtonVariant.Primary,
-    disabled: isPosting,
-    loading: isPosting,
-  };
-
-  return (
-    <Modal
-      kind={Modal.Kind.FlexibleCenter}
-      size={Modal.Size.Medium}
-      onRequestClose={onRequestClose}
-      {...props}
-      formProps={{
-        form: 'share_post',
-        title: 'New post',
-        rightButtonProps: submitProps,
-        copy: { right: 'Post' },
-      }}
-    >
-      <Modal.Header title="New post" />
-      <form
-        className="flex w-full flex-col p-3"
-        action="#"
-        onSubmit={onFormSubmit}
-        id="share_post"
-      >
-        <RichTextInput
-          ref={richTextRef}
-          showUserAvatar
-          textareaProps={{ rows: 5, name: 'commentary' }}
-          sourceId={squad?.id}
-          enabledCommand={{ mention: true }}
-          footer={
-            isLoadingPreview ? (
-              <WritePreviewSkeleton
-                link={link}
-                className="m-3 flex-col-reverse"
-              />
-            ) : (
-              <WriteLinkPreview
-                className="m-3 !w-auto flex-col-reverse"
-                preview={updatedPreview ?? preview}
-                link={link}
-                onLinkChange={onInput}
-                variant="modal"
-              />
-            )
-          }
-        />
-        {shouldShowCta && (
-          <Switch
-            data-testid="push_notification-switch"
-            inputId="push_notification-switch"
-            name="push_notification"
-            labelClassName="flex-1 font-normal"
-            className="py-3"
-            compact={false}
-            checked={isEnabled}
-            onToggle={onToggle}
-          >
-            Receive updates whenever your Squad members engage with your post
-          </Switch>
-        )}
-      </form>
-      <span className="flex flex-row items-center gap-2 px-4 tablet:hidden">
-        {footer}
-      </span>
-      <Modal.Footer className="typo-caption1" justify={Justify.Start}>
-        {footer}
-        <Button {...submitProps} className="ml-auto" form="share_post">
-          Post
-        </Button>
-      </Modal.Footer>
-    </Modal>
-  );
-}
-
-export default CreateSharedPostModal;
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 07dffc5d7bf..0abb1981116 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -288,6 +288,57 @@ describe('SmartComposerModal', () => {
     expect(schedule.parentElement).not.toBe(scheduledNav.parentElement);
   });
 
+  describe('sharing a post to a squad', () => {
+    const postPreview = {
+      id: 'post-1',
+      title: 'The shared article',
+      permalink: 'https://api.daily.dev/r/post-1',
+    };
+
+    it('notifies the caller once the post goes through', async () => {
+      const onPosted = jest.fn();
+
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onPosted={onPosted}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      await hookProps?.onComplete();
+
+      expect(onPosted).toHaveBeenCalledTimes(1);
+      expect(onRequestClose).toHaveBeenCalledTimes(1);
+    });
+
+    it('opens on the link kind with the post seeded, ready to submit', () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          initialSquadId="squad-1"
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+        postPreview.permalink,
+      );
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toHaveValue('');
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.initialPreview).toBe(postPreview);
+      expect(hookProps?.editPostId).toBeUndefined();
+    });
+  });
+
   describe('editing a share post', () => {
     const sharedPost = {
       title: 'The shared article',
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index ae4df1bcf5e..9173d18210a 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -105,6 +105,7 @@ export interface SmartComposerModalProps extends LazyModalCommonProps {
   initialCommentary?: string;
   preview?: ExternalLinkPreview;
   editPost?: Post;
+  onPosted?: () => void;
 }
 
 export function SmartComposerModal({
@@ -118,6 +119,7 @@ export function SmartComposerModal({
   initialCommentary,
   preview: initialPreview,
   editPost,
+  onPosted,
   ...props
 }: SmartComposerModalProps): ReactElement {
   const { user } = useAuthContext();
@@ -413,6 +415,7 @@ export function SmartComposerModal({
           queryKey: getPostByIdKey(editPost.id),
         });
       }
+      onPosted?.();
       onSubmitted();
       onRequestClose?.();
     },
diff --git a/packages/shared/src/components/post/focus/DiscussionShareRow.tsx b/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
index 51058cae65e..f4301b8ef73 100644
--- a/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
+++ b/packages/shared/src/components/post/focus/DiscussionShareRow.tsx
@@ -59,12 +59,12 @@ export const DiscussionShareRow = ({
   const onShareToSquad = (squad: Squad) => {
     logEvent(postLogEvent(LogEvent.StartShareToSquad, post));
     openModal({
-      type: LazyModal.CreateSharedPost,
+      type: LazyModal.SmartComposer,
       props: {
-        squad,
+        initialUrl: post.permalink,
         preview: post,
-        onSharedSuccessfully: () =>
-          logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
+        initialSquadId: squad.id,
+        onPosted: () => logEvent(postLogEvent(LogEvent.ShareToSquad, post)),
       },
     });
   };
diff --git a/packages/shared/src/components/widgets/SocialShare.tsx b/packages/shared/src/components/widgets/SocialShare.tsx
index 41ab8310dfd..84dd2bb811c 100644
--- a/packages/shared/src/components/widgets/SocialShare.tsx
+++ b/packages/shared/src/components/widgets/SocialShare.tsx
@@ -1,4 +1,4 @@
-import type { Dispatch, ReactElement } from 'react';
+import type { Dispatch, ReactElement, SetStateAction } from 'react';
 import React, { useContext } from 'react';
 import { ShareProvider, addLogQueryParams } from '../../lib/share';
 import type { Post } from '../../graphql/posts';
@@ -18,7 +18,7 @@ import { useGetShortUrl } from '../../hooks';
 import { ReferralCampaignKey } from '../../lib';
 import { useAuthContext } from '../../contexts/AuthContext';
 import type { Squad } from '../../graphql/sources';
-import { CreateSharedPostModal } from '../modals/post/CreateSharedPostModal';
+import { SmartComposerModal } from '../modals/post/SmartComposerModal';
 import type { ModalProps } from '../modals/common/Modal';
 
 interface SocialShareProps extends Pick<ModalProps, 'parentSelector'> {
@@ -27,7 +27,10 @@ interface SocialShareProps extends Pick<ModalProps, 'parentSelector'> {
   comment?: Comment;
   onClose?: () => void;
   commentary?: string;
-  shareToSquadState: [Squad, Dispatch<Squad>];
+  shareToSquadState: [
+    Squad | undefined,
+    Dispatch<SetStateAction<Squad | undefined>>,
+  ];
 }
 
 export const SocialShare = ({
@@ -101,23 +104,24 @@ export const SocialShare = ({
       <SocialShareContainer title="Share externally">
         <SocialShareList
           link={link}
-          description={post?.title}
+          description={post?.title ?? ''}
           emailSummary={post?.summary}
           isCopying={copying}
           onCopy={logAndCopyLink}
-          onNativeShare={() => openNativeSharePost(post)}
+          onNativeShare={() => openNativeSharePost?.(post)}
           onClickSocial={logClick}
           emailTitle={emailTitle}
         />
       </SocialShareContainer>
       {squadToShare && ( // using lazy modal would result to dep-cycle since this whole component is used in the share modal
-        <CreateSharedPostModal
+        <SmartComposerModal
           isOpen
+          initialUrl={post.permalink}
           preview={post}
-          squad={squadToShare}
-          onSharedSuccessfully={onSharedSuccessfully}
+          initialSquadId={squadToShare.id}
+          onPosted={onSharedSuccessfully}
           parentSelector={parentSelector}
-          onRequestClose={() => setSquadToShare(null)}
+          onRequestClose={() => setSquadToShare(undefined)}
         />
       )}
     </>

From 089848dbb467a2fd41e86eb470255d59ee42862a Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 4 Aug 2026 14:44:44 +0300
Subject: [PATCH 03/12] test(share): assert the composer opens from the share
 modal

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shared/src/components/modals/ShareModal.spec.tsx     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/components/modals/ShareModal.spec.tsx b/packages/shared/src/components/modals/ShareModal.spec.tsx
index 92b8fe04c65..e706bed4c39 100644
--- a/packages/shared/src/components/modals/ShareModal.spec.tsx
+++ b/packages/shared/src/components/modals/ShareModal.spec.tsx
@@ -95,11 +95,16 @@ describe('ShareModal Test Suite:', () => {
     });
   });
 
-  it('should render the component with logged user and squads and open the share to squad modal', async () => {
+  it('should render the component with logged user and squads and open the share to squad composer', async () => {
     renderComponent(true, true);
     const btn = await screen.findByTestId(`social-share-@${squads[0].handle}`);
     fireEvent.click(btn);
-    await screen.findByText('New post');
+    expect(
+      await screen.findByRole('textbox', { name: 'Post commentary' }),
+    ).toBeInTheDocument();
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
   });
 
   it('should render the Facebook button and navigate to the correct link', async () => {

From 4bd45db1b2dffa22a21b46f4ac4c3451b826cbbc Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Tue, 4 Aug 2026 14:59:08 +0300
Subject: [PATCH 04/12] fix(composer): compare dirty state against seeded
 values

A composer opened pre-filled (share-to-squad, ?share= deep links) counted
its own seed as unsaved changes, so closing it untouched asked to discard
a draft the user never wrote.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../modals/post/SmartComposerModal.spec.tsx   | 41 ++++++++++++++++++-
 .../modals/post/SmartComposerModal.tsx        | 18 +++++++-
 2 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 0abb1981116..616dbd47fc8 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { useAuthContext } from '../../../contexts/AuthContext';
 import { useLogContext } from '../../../contexts/LogContext';
@@ -315,6 +315,45 @@ describe('SmartComposerModal', () => {
       expect(onRequestClose).toHaveBeenCalledTimes(1);
     });
 
+    it('closes an untouched seeded composer without the discard prompt', async () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(onRequestClose).toHaveBeenCalledTimes(1));
+      expect(showPrompt).not.toHaveBeenCalled();
+    });
+
+    it('still prompts once the commentary diverges from the seed', async () => {
+      showPrompt.mockResolvedValue(false);
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          initialUrl={postPreview.permalink}
+          preview={postPreview}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.change(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+        {
+          target: { value: 'my take' },
+        },
+      );
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(showPrompt).toHaveBeenCalledTimes(1));
+      expect(onRequestClose).not.toHaveBeenCalled();
+    });
+
     it('opens on the link kind with the post seeded, ready to submit', () => {
       renderWithClient(
         <SmartComposerModal
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index 9173d18210a..d55dc533be3 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -239,10 +239,20 @@ export function SmartComposerModal({
     if (cover) {
       return true;
     }
-    if (text.title.trim() || text.body.trim()) {
+    // Dirty means diverged from what the composer was seeded with, not merely
+    // non-empty — share-to-squad and deep links pre-fill the URL and text.
+    const isChanged = (value: string, initial: string | undefined) =>
+      value.trim() !== (initial ?? '').trim();
+    if (
+      isChanged(text.title, initialTitle) ||
+      isChanged(text.body, initialContent)
+    ) {
       return true;
     }
-    if (link.url.trim() || link.commentary.trim()) {
+    if (
+      isChanged(link.url, initialUrl) ||
+      isChanged(link.commentary, initialCommentary)
+    ) {
       return true;
     }
     if (poll.question.trim() || poll.options.some((option) => option.trim())) {
@@ -261,6 +271,10 @@ export function SmartComposerModal({
     editPost,
     editShare,
     editShareCommentary,
+    initialTitle,
+    initialContent,
+    initialUrl,
+    initialCommentary,
   ]);
 
   const confirmDiscardIfDirty = useCallback(async () => {

From fc6c88305ae7a2fb4832d2a90d7db0b1e1aaf682 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 00:43:42 +0300
Subject: [PATCH 05/12] chore(composer): trim commentary to load-bearing notes

Comments explaining what the code already says, narrating fixed bugs, or
restating test names are removed; the ones that survive state constraints
the code cannot show (platform quirks, cross-file contracts, do-not-readd
traps).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../components/comments/CommentInput.spec.tsx |  3 +-
 .../src/components/comments/CommentInput.tsx  |  8 +---
 .../src/components/drawers/Drawer.spec.tsx    | 12 +----
 .../shared/src/components/drawers/Drawer.tsx  | 34 ++++----------
 .../CommentMarkdownInput.spec.tsx             |  3 --
 .../MarkdownInput/CommentMarkdownInput.tsx    | 16 +------
 .../RichTextEditor/RichTextToolbar.spec.tsx   |  7 +--
 .../fields/RichTextEditor/RichTextToolbar.tsx | 14 +-----
 .../components/fields/RichTextInput.spec.tsx  |  7 +--
 .../src/components/fields/RichTextInput.tsx   | 44 ++++++-------------
 .../src/components/fields/Switch.spec.tsx     |  2 -
 .../shared/src/components/fields/Switch.tsx   |  2 -
 .../modals/post/SmartComposerModal.tsx        | 15 +------
 .../shared/src/components/post/NewComment.tsx |  2 -
 .../components/post/composer/AudienceChip.tsx |  4 +-
 .../src/components/post/composer/LinkForm.tsx |  7 +--
 .../post/composer/useComposerSubmit.spec.tsx  |  3 +-
 .../post/composer/useComposerSubmit.ts        | 13 ++----
 packages/shared/src/lib/postComment.ts        |  6 +--
 packages/webapp/__tests__/FooterWrapper.tsx   |  2 -
 packages/webapp/__tests__/PostPage.tsx        |  2 -
 21 files changed, 42 insertions(+), 164 deletions(-)

diff --git a/packages/shared/src/components/comments/CommentInput.spec.tsx b/packages/shared/src/components/comments/CommentInput.spec.tsx
index 9f320276456..effb09b2099 100644
--- a/packages/shared/src/components/comments/CommentInput.spec.tsx
+++ b/packages/shared/src/components/comments/CommentInput.spec.tsx
@@ -68,8 +68,7 @@ describe('CommentInput', () => {
   });
 
   it('drops the drawer default padding so content is not padded twice', () => {
-    // Including the bottom: the composer's action bar carries the safe-area
-    // inset itself, so drawer padding under it read as double spacing.
+    // Including the bottom: the composer's action bar carries the safe area.
     jest.mocked(useViewSize).mockReturnValue(false);
     render(<CommentInput post={post} onClose={jest.fn()} />);
 
diff --git a/packages/shared/src/components/comments/CommentInput.tsx b/packages/shared/src/components/comments/CommentInput.tsx
index 050bcd1129b..a00e573cfc8 100644
--- a/packages/shared/src/components/comments/CommentInput.tsx
+++ b/packages/shared/src/components/comments/CommentInput.tsx
@@ -16,8 +16,6 @@ export default function CommentInput({
   className,
   ...props
 }: CommentInputProps): ReactElement {
-  // Writing a comment on a phone gets the whole screen, the same way creating a
-  // post does — a box wedged into the page leaves too little room to write in.
   const isFullScreen = !useViewSize(ViewSize.Laptop);
 
   const mutateCommentResult = useMutateComment({
@@ -30,8 +28,6 @@ export default function CommentInput({
   const composer = (
     <CommentMarkdownInput
       {...props}
-      // The drawer is the reason to open the keyboard immediately: there is
-      // nothing else on screen to interact with.
       autoFocus={isFullScreen || props.autoFocus}
       fills={isFullScreen}
       className={isFullScreen ? undefined : className}
@@ -47,9 +43,7 @@ export default function CommentInput({
         <Drawer
           isOpen
           isFullScreen
-          // The composer can sit under animated/transformed ancestors (e.g. the
-          // `animate-composer-in` wrapper), which trap `position: fixed` and
-          // pin the drawer mid-page. Portal to the root so it fills the screen.
+          // Transformed ancestors (`animate-composer-in`) trap position: fixed
           appendOnRoot
           position={DrawerPosition.Bottom}
           onClose={() => onClose?.()}
diff --git a/packages/shared/src/components/drawers/Drawer.spec.tsx b/packages/shared/src/components/drawers/Drawer.spec.tsx
index 36b293773cb..ed8f5f6b2d7 100644
--- a/packages/shared/src/components/drawers/Drawer.spec.tsx
+++ b/packages/shared/src/components/drawers/Drawer.spec.tsx
@@ -16,8 +16,6 @@ describe('Drawer', () => {
   });
 
   it('sizes a full-screen drawer to the visual viewport', () => {
-    // The virtual keyboard shrinks the visual viewport, not the layout one, so
-    // this is what keeps bottom action bars above the keyboard.
     jest
       .mocked(useVisualViewport)
       .mockReturnValue({ width: 375, height: 500, offsetTop: 40 });
@@ -44,9 +42,7 @@ describe('Drawer', () => {
   });
 
   it('locks the page scroll behind it while open', () => {
-    // Regression: scrolling inside the mobile composer drawer chained to the
-    // post page behind it, which visibly jumped and shifted. <html> is the
-    // page's actual scroller, so the body class alone does not block it.
+    // <html> is the page's actual scroller — the body class alone is not enough.
     const { unmount } = render(
       <Drawer isOpen isFullScreen onClose={jest.fn()}>
         content
@@ -81,8 +77,6 @@ describe('Drawer', () => {
   });
 
   it('leaves the page scrollable behind a partial drawer', () => {
-    // Only full-screen drawers cover the page. Context menus and pickers keep
-    // the page scrollable, exactly as they did before the composer fix.
     const { unmount } = render(
       <Drawer isOpen onClose={jest.fn()}>
         content
@@ -123,9 +117,7 @@ describe('Drawer', () => {
   });
 
   it('closes only on a direct backdrop hit, not on bubbled child clicks', () => {
-    // Portaled dropdowns bubble synthetic clicks up the React tree; treating
-    // any outside-the-panel target as a backdrop hit closed the drawer when
-    // picking a dropdown item.
+    // Portaled dropdowns bubble synthetic clicks up the React tree.
     jest.useFakeTimers();
     const onClose = jest.fn();
     render(
diff --git a/packages/shared/src/components/drawers/Drawer.tsx b/packages/shared/src/components/drawers/Drawer.tsx
index a245277afac..840c6eb3481 100644
--- a/packages/shared/src/components/drawers/Drawer.tsx
+++ b/packages/shared/src/components/drawers/Drawer.tsx
@@ -58,9 +58,7 @@ export interface DrawerOnMobileProps {
   drawerProps?: Omit<DrawerProps, 'children' | 'onClose'>;
 }
 
-// Drawers can stack (a picker drawer above the composer drawer); the page
-// unlocks only when the last one leaves, and hands back the inline overflow it
-// found rather than deleting whatever another lock may have set.
+// Drawers can stack; the page unlocks only when the last one leaves.
 let scrollLockCount = 0;
 let previousHtmlOverflow = '';
 
@@ -94,9 +92,6 @@ function BaseDrawer({
   ...props
 }: DrawerProps): ReactElement {
   const container = useRef<HTMLDivElement | null>(null);
-  // Only full-screen drawers size themselves from the visual viewport, so only
-  // they subscribe: `scroll` fires continuously on iOS while the keyboard is
-  // open, and every event would re-render each mounted drawer's subtree.
   const { height: viewportHeight, offsetTop } = useVisualViewport(isFullScreen);
   const keyboardSafeStyle =
     isFullScreen && viewportHeight
@@ -115,17 +110,12 @@ function BaseDrawer({
   }, [onAfterClose, onAfterOpen]);
 
   useEffect(() => {
-    // Scoped to full-screen drawers: they cover the page, so a scroll that
-    // chains through to it visibly jumps the content behind. Partial drawers
-    // (context menus, pickers) keep the page scrollable, as they always have.
     if (!isFullScreen) {
       return undefined;
     }
 
-    // Same body lock react-modal applies (`ReactModal__Body--open`), plus the
-    // html element: <html> is the page's actual scroller, so body-level
-    // `overflow: hidden` never reaches the viewport and touch scrolls chain
-    // through the drawer anyway.
+    // <html> is the page's actual scroller — body-level `overflow: hidden`
+    // alone never reaches the viewport.
     if (scrollLockCount === 0) {
       previousHtmlOverflow = document.documentElement.style.overflow;
     }
@@ -150,11 +140,8 @@ function BaseDrawer({
   const handleOverlayClick = (e: React.MouseEvent) => {
     e.stopPropagation();
 
-    // Only a hit on the backdrop itself closes the drawer. A `contains` check
-    // fails for portaled children (dropdowns, popovers): they live under
-    // `document.body`, but React bubbles their synthetic clicks up the React
-    // tree to this handler, so picking an item read as an outside click and
-    // tore the drawer down instead of running the item's own action.
+    // Not a `contains` check: portaled children (dropdowns, popovers) live
+    // under document.body, yet React bubbles their clicks to this handler.
     if (closeOnOutsideClick && hasAnimated && e.target === e.currentTarget) {
       onClose(e.nativeEvent);
     }
@@ -165,9 +152,9 @@ function BaseDrawer({
     <div
       className={classNames(
         'fixed z-modal transition-opacity duration-300 ease-in-out',
-        // A full-screen drawer is sized to the *visual* viewport so its bottom
-        // actions sit above the virtual keyboard. iOS never shrinks the layout
-        // viewport for the keyboard, so `inset-0` alone leaves them underneath.
+        // Sized to the *visual* viewport: iOS never shrinks the layout
+        // viewport for the keyboard, so `inset-0` alone leaves the bottom
+        // actions underneath it.
         isFullScreen ? 'inset-x-0 top-0 h-full' : 'inset-0',
         !isFullScreen && 'bg-overlay-quaternary-onion',
         className?.overlay,
@@ -179,8 +166,6 @@ function BaseDrawer({
       <div
         {...props}
         className={classNames(
-          // `overscroll-contain` stops a scroll that reaches this scroller's
-          // edge from chaining to the page behind the drawer.
           'drawer-padding absolute flex w-full flex-col overflow-y-auto overscroll-contain bg-background-default transition-transform duration-300 ease-in-out',
           isFullScreen ? 'inset-0' : 'max-h-[calc(100%-5rem)]',
           !isFullScreen && drawerPositionToClassName[position],
@@ -256,8 +241,7 @@ function AnimatedDrawer(
   const [isClosing, setIsClosing] = useState(false);
   const [debounceClosing] = useDebounceFn<PopupEventType>((e) => {
     setIsClosing(false);
-    // `StartFn` types its argument as optional, but `onClosing` below is the
-    // only caller and always forwards the event that triggered the close.
+    // `onClosing`, the only caller, always forwards the event.
     onClose?.(e as PopupEventType);
   }, ANIMATION_MS);
 
diff --git a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
index 012addbd9bb..50e4b24225a 100644
--- a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
+++ b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
@@ -185,9 +185,6 @@ describe('CommentMarkdownInput', () => {
   });
 
   it('sits on one 20px frame on every side in the drawer', () => {
-    // The action bar already carries 20px. Inline, the header and avatar hug
-    // the comment list's 16px guideline; in the drawer there is no list to
-    // line up with, and the mismatch read as unequal padding.
     setViewportHeight(800);
     renderComposer({ fills: true });
 
diff --git a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
index a75259775ba..e801d576f20 100644
--- a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
+++ b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
@@ -47,13 +47,10 @@ export interface CommentMarkdownInputProps {
   onChange?: (value: string) => void;
   formProps?: FormHTMLAttributes<HTMLFormElement>;
   onClose?: () => void;
-  /** Fills its container instead of capping against the viewport. For the
-   * mobile full-screen drawer, which is already sized to the visual viewport. */
+  /** Fills its container instead of capping against the viewport. */
   fills?: boolean;
 }
 
-// The composer grows with its content up to this cap, then scrolls internally
-// so the action bar — and the caret — stay put instead of running off-screen.
 const MIN_COMPOSER_HEIGHT = 224;
 const MAX_COMPOSER_HEIGHT = 512;
 const VIEWPORT_HEIGHT_RATIO = 0.8;
@@ -84,9 +81,6 @@ export function CommentMarkdownInputComponent(
   const richTextRef = useRef<RichTextInputRef | null>(null);
   const [isMarkdownMode, setIsMarkdownMode] = useState(false);
 
-  // The visual viewport — not the layout viewport — is what stays visible once
-  // the virtual keyboard opens. Capping against it is what keeps a long comment
-  // from pushing its own submit button behind the keyboard on mobile.
   const { height: viewportHeight } = useVisualViewport();
   const maxHeight =
     viewportHeight && !fills
@@ -106,8 +100,6 @@ export function CommentMarkdownInputComponent(
     submitCopy = 'Reply';
   }
 
-  // A top-level comment is still a reply to whoever put the post up, so the
-  // strip falls back to the post author and then to the source that owns it.
   const replyingTo = replyTo ?? post?.author?.username ?? post?.source?.handle;
   let headerLabel: ReactNode = null;
   if (editCommentId) {
@@ -165,7 +157,6 @@ export function CommentMarkdownInputComponent(
       {...formProps}
       action="#"
       onSubmit={onSubmitForm}
-      // Names the form for assistive tech, and gives it a role to query by.
       aria-label={submitCopy}
       className={classNames(
         'flex min-h-0 flex-col',
@@ -189,15 +180,10 @@ export function CommentMarkdownInputComponent(
         className={{
           container: classNames(
             '!min-h-0 flex-1 overflow-hidden',
-            // In the drawer the composer *is* the screen, so it drops the card
-            // treatment that separates it from the page when inline.
             fills
               ? '!rounded-none !bg-transparent'
               : 'border border-border-subtlest-tertiary',
           ),
-          // Inline, the avatar sits on the comment list's guideline. In the
-          // drawer there is no list to line up with, so it joins the 20px
-          // frame the action bar and create-post composer already use.
           profile: fills ? '!ml-5' : undefined,
         }}
         postId={postId}
diff --git a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
index 3480cd220ce..a42413d2656 100644
--- a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
+++ b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
@@ -68,8 +68,6 @@ describe('RichTextToolbar leading actions', () => {
   });
 
   it('renders the leading slot exactly once on its own row when stacked', () => {
-    // Regression: the stacked row rendered *in addition to* the inline slot,
-    // so mobile showed two kind pickers.
     renderToolbar(true);
 
     expect(
@@ -87,9 +85,8 @@ describe('RichTextToolbar leading actions', () => {
   });
 
   it('moves overflowed formatting into the menu with a working trigger', () => {
-    // Regression: wrapping the trigger in `Tooltip` blurred it on mouseup,
-    // which dismissed the non-modal Radix menu before it could paint. The
-    // tooltip must ride on the trigger's own `tooltip` prop instead.
+    // The tooltip must ride on the trigger's own `tooltip` prop — a `Tooltip`
+    // wrapper blurs on mouseup and dismisses the non-modal menu.
     const nativeResizeObserver = global.ResizeObserver;
     let triggerResize: (() => void) | undefined;
     const observerStub = (
diff --git a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.tsx b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.tsx
index 053f871ef2c..a638d8c7269 100644
--- a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.tsx
+++ b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.tsx
@@ -243,8 +243,6 @@ function RichTextToolbarComponent(
   });
 
   const formattingItems = useMemo<ToolbarItem[]>(() => {
-    // Markdown mode edits raw text, so the rich-text commands have nothing to
-    // act on; the bar itself stays mounted so the actions beside it hold still.
     if (hideFormatting) {
       return [];
     }
@@ -387,8 +385,7 @@ function RichTextToolbarComponent(
     const rightWidth =
       rightActionsRef.current?.getBoundingClientRect().width ?? 0;
     // Dividers and the row's own gaps are laid out but belong to no ref, so
-    // leaving them out of the budget is what let the last button — and the
-    // overflow chevron itself — get sliced by the group's `overflow-hidden`.
+    // the budget must account for them separately.
     const dividerCount =
       (leadingActions && !stackLeading ? 1 : 0) +
       (inlineActions ? 1 : 0) +
@@ -468,9 +465,6 @@ function RichTextToolbarComponent(
 
   return (
     <>
-      {/* On a narrow screen the kind picker plus the icon actions cannot fit
-          beside the submit button, and the overflow menu only relocates
-          formatting items — so the leading slot gets its own row instead. */}
       {stackLeading && leadingActions && (
         <div className="flex flex-row items-center px-5 pt-4">
           {leadingActions}
@@ -490,9 +484,6 @@ function RichTextToolbarComponent(
           className={classNames(
             'flex min-w-0 flex-1 items-center gap-0',
             position === 'top' && 'flex-wrap',
-            // `shrink` (not `flex-1`) on the clipped group: the global
-            // `flex-shrink: 0` reset means it needs the opt-in, and growing it
-            // would shove the overflow button across to the submit button.
             position === 'bottom' && 'flex-nowrap',
           )}
         >
@@ -528,8 +519,7 @@ function RichTextToolbarComponent(
             )}
             {renderedFormattingItems}
           </div>
-          {/* Outside the clipped group on purpose: it is the escape hatch for
-              everything that did not fit, so it must never be cut itself. */}
+          {/* Outside the clipped group so the overflow menu is never cut itself. */}
           {isOverflowable && <OverflowMenu items={overflowItems} />}
         </div>
         {rightActions && (
diff --git a/packages/shared/src/components/fields/RichTextInput.spec.tsx b/packages/shared/src/components/fields/RichTextInput.spec.tsx
index 8cf34e21cc0..ac117693c9f 100644
--- a/packages/shared/src/components/fields/RichTextInput.spec.tsx
+++ b/packages/shared/src/components/fields/RichTextInput.spec.tsx
@@ -195,8 +195,6 @@ describe('RichTextInput', () => {
   });
 
   it('keeps one avatar mounted across the markdown toggle', () => {
-    // Regression: each mode used to build its own subtree, so toggling
-    // remounted the avatar (refetching the image, hence the visible blink).
     mockUser = {
       id: 'u1',
       username: 'ido',
@@ -227,8 +225,7 @@ describe('RichTextInput', () => {
 
   it('queues an early focus until the editor is created', () => {
     // The editor is created async (`immediatelyRender: false`), while the
-    // composer requests autofocus from a mount-time ref callback. Regression:
-    // that focus silently no-oped, leaving reply composers unfocused.
+    // composer requests autofocus from a mount-time ref callback.
     mockEditorReady = false;
     const ref = React.createRef<RichTextInputRef>();
     const { rerender } = render(
@@ -245,8 +242,6 @@ describe('RichTextInput', () => {
   });
 
   it('gives the bottom bar the safe-area floor instead of the drawer', () => {
-    // `max(1.25rem, safe-area)` on the bar itself keeps the bottom spacing
-    // equal to the sides; drawer padding stacked under it read as double.
     render(<RichTextInput toolbarPosition="bottom" hideFooter />);
 
     expect(
diff --git a/packages/shared/src/components/fields/RichTextInput.tsx b/packages/shared/src/components/fields/RichTextInput.tsx
index 4c8360010d9..066fba54c58 100644
--- a/packages/shared/src/components/fields/RichTextInput.tsx
+++ b/packages/shared/src/components/fields/RichTextInput.tsx
@@ -529,9 +529,6 @@ function RichTextInput(
     upload.insertImage(gifUrl, altText);
   };
 
-  // Captured before the swap so the view can be put back exactly where it was;
-  // otherwise one direction snapped to the top and the other to the end, which
-  // scrolled the avatar out of sight and read as the composer redrawing.
   const rememberScroll = useCallback(() => {
     scrollOffsetRef.current = scrollContainerRef.current?.scrollTop ?? 0;
     shouldRestoreScrollRef.current = true;
@@ -587,17 +584,14 @@ function RichTextInput(
         if (!textarea) {
           return;
         }
-        // Land where the rich editor lands. Leaving the textarea caret at 0
-        // snapped the box to the top going one way and to the end coming back,
-        // which read as the avatar vanishing when it had only scrolled off.
+        // Caret at the end, matching where the rich editor lands.
         textarea.focus({ preventScroll: true });
         const end = textarea.value.length;
         textarea.setSelectionRange(end, end);
         restoreScroll();
         return;
       }
-      // `scrollIntoView: false` or ProseMirror yanks the box to the caret
-      // straight after the restore below, undoing it.
+      // `scrollIntoView: false` or ProseMirror undoes the restore below.
       editorRef.current?.commands.focus('end', { scrollIntoView: false });
       restoreScroll();
     });
@@ -612,16 +606,12 @@ function RichTextInput(
     if (!ta) {
       return;
     }
-    // Grow to fit like the rich editor does, so the surrounding box keeps its
-    // height when the two swap; the scroll container above absorbs the excess.
-    // Measured from 0 rather than `auto` so the `rows` attribute doesn't act as
-    // a floor — `minHeightClassName` is what sets the empty height, in both
-    // modes, which is what keeps them the same size.
+    // Measured from 0, not `auto`, so `rows` never acts as a floor —
+    // `minHeightClassName` sets the empty height in both modes.
     ta.style.height = '0px';
     ta.style.height = `${ta.scrollHeight}px`;
-    // Swapping the editor out momentarily shrinks the scroll container, which
-    // clamps its offset to 0. Put it back here, once the textarea has its real
-    // height and before paint — restoring from a later frame was too late.
+    // Swapping editors momentarily shrinks the scroll container, clamping its
+    // offset to 0; restore before paint — a later frame is too late.
     restoreScroll();
   }, [input, isMarkdownMode, restoreScroll]);
 
@@ -779,9 +769,7 @@ function RichTextInput(
 
   const isBottomToolbar = toolbarPosition === 'bottom';
   // Rendered outside the rich/markdown branches so switching editors never
-  // drops it. `ml-4 mt-4` puts it on the same guideline as the avatar in
-  // `CommentContainer` (a `p-4` box), so the composer lines up with the
-  // comments underneath it.
+  // drops it.
   const avatar = showUserAvatar && user && (
     <ProfilePicture
       size={ProfileImageSize.Large}
@@ -899,9 +887,8 @@ function RichTextInput(
       />
     ) : null;
 
-  // Both editors hang off one tree so that toggling markdown swaps only the
-  // editor element. Building a separate subtree per mode remounted the avatar
-  // (refetching the image, hence the blink) and the action bar with it.
+  // Both editors hang off one tree so toggling markdown swaps only the editor
+  // element instead of remounting the avatar and action bar.
   const rightActionsNode = (
     <div
       className={classNames(
@@ -959,10 +946,8 @@ function RichTextInput(
       }}
       position={toolbarPosition}
       className={
-        // The bar absorbs the device safe area itself so a drawer around it
-        // adds no bottom padding of its own — stacking the two read as double
-        // spacing under the actions. Everywhere else the max() resolves to
-        // the same 1.25rem as the sides.
+        // The bar absorbs the device safe area itself; the drawer around it
+        // adds no bottom padding of its own (`!p-0`).
         isBottomToolbar
           ? '!gap-3 !px-5 !pb-[max(1.25rem,env(safe-area-inset-bottom))] !pt-4'
           : undefined
@@ -1004,11 +989,8 @@ function RichTextInput(
           className={classNames(
             styles.editor,
             minHeightClassName,
-            // A column flex box so the editable child can fill it by flexing.
-            // Sizing it with `height: 100%` instead only worked where this box
-            // had a definite height; where the height comes from
-            // `minHeightClassName`, the child collapsed to its text and clicks
-            // below the first line missed the editor.
+            // Flex, not `height: 100%`, on the editable child: a percentage
+            // resolves to nothing under a `min-height`-only ancestor.
             'flex min-w-0 flex-1 flex-col p-4',
             avatar && '!pl-3',
             className?.input,
diff --git a/packages/shared/src/components/fields/Switch.spec.tsx b/packages/shared/src/components/fields/Switch.spec.tsx
index 70c16b95188..9b9c3eb420e 100644
--- a/packages/shared/src/components/fields/Switch.spec.tsx
+++ b/packages/shared/src/components/fields/Switch.spec.tsx
@@ -36,8 +36,6 @@ describe('Switch', () => {
   });
 
   it('lets a long label wrap instead of running off screen', () => {
-    // Regression: the "Receive updates..." label overlapped the track and bled
-    // past the right edge on mobile because the label span could not shrink.
     renderSwitch();
 
     expect(screen.getByText(LONG_LABEL)).toHaveClass('min-w-0');
diff --git a/packages/shared/src/components/fields/Switch.tsx b/packages/shared/src/components/fields/Switch.tsx
index 90bdce9599c..5dfa6619d93 100644
--- a/packages/shared/src/components/fields/Switch.tsx
+++ b/packages/shared/src/components/fields/Switch.tsx
@@ -213,8 +213,6 @@ function SwitchComponent(
       {children ? (
         <span
           className={classNames(
-            // `min-w-0` so a long label wraps instead of running past the
-            // track and off the edge of a narrow screen.
             'ml-3 min-w-0 font-medium antialiased',
             defaultTypo && (compact ? 'typo-footnote' : 'typo-callout'),
             styles.children,
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index d55dc533be3..aca5972ccaa 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -239,8 +239,6 @@ export function SmartComposerModal({
     if (cover) {
       return true;
     }
-    // Dirty means diverged from what the composer was seeded with, not merely
-    // non-empty — share-to-squad and deep links pre-fill the URL and text.
     const isChanged = (value: string, initial: string | undefined) =>
       value.trim() !== (initial ?? '').trim();
     if (
@@ -391,8 +389,6 @@ export function SmartComposerModal({
   const isMulti = selected.length > 1;
 
   const schedule = useSchedulePost();
-  // Scheduling: single-source, non-moderated create only (any post type
-  // except standups, which schedule themselves).
   const canSchedule =
     kind !== 'standup' &&
     !isEditing &&
@@ -418,8 +414,6 @@ export function SmartComposerModal({
     primary,
     selectedIds,
     isMulti,
-    // Editing a share has no URL to resolve, so seed the preview with the
-    // post's own shared content instead of fetching one.
     initialPreview: editShare?.sharedPost ?? initialPreview,
     editPostId: editPost?.id,
     resolveScheduledAt: canSchedule ? schedule.resolveScheduledAt : undefined,
@@ -506,12 +500,7 @@ export function SmartComposerModal({
       {submitLabel}
     </Button>
   );
-  // On mobile the calendar belongs with the header's scheduling control (the
-  // clock), leaving the bottom bar to the Post button; on desktop both stay
-  // beside Post.
   const scheduleInHeader = !isLaptop;
-  // Self-contained flex with its own gap so the button pair keeps identical
-  // spacing regardless of the parent (rich-text toolbar vs. bottom action bar).
   const primaryActionsNode = (
     <div className="flex items-center gap-2">
       {!scheduleInHeader && scheduleButtonNode}
@@ -681,9 +670,7 @@ export function SmartComposerModal({
           {kind === 'poll' && <PollForm value={poll} onChange={setPoll} />}
         </div>
       )}
-      {/* Text keeps its actions inside the editor's own bottom bar, in both
-          rich and markdown mode — adding them here too gave markdown a second
-          bar and made the buttons jump on every toggle. */}
+      {/* Text keeps its actions inside the editor's own bottom bar. */}
       {kind !== 'text' && kind !== 'standup' && (
         <div className="flex shrink-0 flex-col gap-3 px-5 pb-5 pt-4">
           <div className="flex items-center justify-between gap-3">
diff --git a/packages/shared/src/components/post/NewComment.tsx b/packages/shared/src/components/post/NewComment.tsx
index 1322000fac3..b77b7fc0566 100644
--- a/packages/shared/src/components/post/NewComment.tsx
+++ b/packages/shared/src/components/post/NewComment.tsx
@@ -53,8 +53,6 @@ const focusInputById = (inputId: string, remainingFrames = 30): void => {
   const input = document.getElementById(inputId);
   if (input) {
     input.focus();
-    // The composer now lives in the page flow, so a trigger far from it (the
-    // mobile floating bar, the post actions row) can open it off-screen.
     input.scrollIntoView?.({ behavior: 'smooth', block: 'center' });
     return;
   }
diff --git a/packages/shared/src/components/post/composer/AudienceChip.tsx b/packages/shared/src/components/post/composer/AudienceChip.tsx
index 6ec426a5d17..6f41ebb506e 100644
--- a/packages/shared/src/components/post/composer/AudienceChip.tsx
+++ b/packages/shared/src/components/post/composer/AudienceChip.tsx
@@ -158,9 +158,7 @@ export const AudienceChip = ({
           aria-expanded={canPickAudience ? open : undefined}
           aria-label={buildAriaLabel()}
           className={classNames(
-            // `shrink`, not `shrink-0`: the global `flex-shrink: 0` reset means
-            // this has to be opted into, and without it a long audience name
-            // pushes the header's own actions off a narrow screen.
+            // `shrink` opts back in past the global `flex-shrink: 0` reset.
             'flex min-w-0 max-w-full shrink items-center gap-1.5 rounded-12 px-2.5 py-1 text-text-primary transition-colors typo-callout',
             showChevron && 'hover:bg-surface-float',
             !showChevron && 'cursor-default',
diff --git a/packages/shared/src/components/post/composer/LinkForm.tsx b/packages/shared/src/components/post/composer/LinkForm.tsx
index ed606377cd7..4485e4794b0 100644
--- a/packages/shared/src/components/post/composer/LinkForm.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.tsx
@@ -23,10 +23,7 @@ interface LinkFormProps {
   fetchPreview: (url?: string) => void;
   onDismissPreview?: () => void;
   initialUrl?: string;
-  /**
-   * Editing an existing share: the link itself is fixed, so the URL field and
-   * the preview's remove button are dropped and only the commentary is open.
-   */
+  /** Drops the URL field and preview removal; only the commentary is open. */
   isUrlLocked?: boolean;
 }
 
@@ -80,8 +77,6 @@ export const LinkForm = ({
     onDismissPreview?.();
   };
 
-  // A locked link is the post's own shared content, so it is always the right
-  // preview to show — there is no URL being typed for it to race against.
   const showPreview =
     isUrlLocked ||
     (isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl);
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
index 2aba907e156..a59608fdda6 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
@@ -93,8 +93,7 @@ describe('useComposerSubmit editing a share', () => {
   });
 
   it('stays submittable without a resolved preview', () => {
-    // The link is fixed while editing, so there is no URL/preview pair to
-    // validate — requiring one left the Post button permanently disabled.
+    // The link is fixed while editing — there is no URL/preview to validate.
     const { result } = renderSubmit();
 
     expect(result.current.isSubmitDisabled).toBe(false);
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.ts b/packages/shared/src/components/post/composer/useComposerSubmit.ts
index 4bc700b4f6c..b34bf0b8034 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.ts
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.ts
@@ -125,8 +125,7 @@ export const useComposerSubmit = ({
       if (editPostId) {
         return;
       }
-      // Scheduled posts aren't visible yet, so don't navigate to the post
-      // page — just confirm and let onComplete close the composer.
+      // A scheduled post's page isn't visible yet — confirm instead.
       if (post.flags?.scheduledAt) {
         displayToast('✅ Your post has been scheduled!');
         return;
@@ -179,16 +178,14 @@ export const useComposerSubmit = ({
       return !isTextValid(text);
     }
     if (kind === 'link') {
-      // Editing keeps the original link, so the URL/preview pair it would
-      // normally validate is not in play.
+      // Editing keeps the original link — there is no URL/preview to validate.
       return editPostId ? false : !isLinkValid(link, preview);
     }
     return !isPollValid(poll);
   };
 
-  // Scheduling is single-source and non-moderated only. The `scheduledAt` here
-  // is already gated by the caller (undefined unless the post is schedulable),
-  // and it routes through the dedicated single-source mutation for each type.
+  // `scheduledAt` is gated by the caller: undefined unless the post is
+  // schedulable (single-source, non-moderated).
   const submitText = async (scheduledAt?: string) => {
     const payload = {
       title: text.title.trim(),
@@ -256,8 +253,6 @@ export const useComposerSubmit = ({
     scheduledAt?: string,
   ) => {
     if (editPostId) {
-      // Only the commentary is editable on a share — the link it points at is
-      // fixed, so there is no preview to re-resolve first.
       await onUpdateSharePost(
         event,
         editPostId,
diff --git a/packages/shared/src/lib/postComment.ts b/packages/shared/src/lib/postComment.ts
index fdb2b5d3c88..90abf981feb 100644
--- a/packages/shared/src/lib/postComment.ts
+++ b/packages/shared/src/lib/postComment.ts
@@ -7,10 +7,8 @@ export interface OpenPostCommentEventDetail {
   origin: Origin;
 }
 
-// The mobile floating bar lives in the layout's footer, a sibling tree to the
-// post content that owns the composer. A window event is the cheapest way for
-// the bar to reach the in-page composer without threading a provider through
-// every layout that renders the footer.
+// The floating bar lives in the layout footer, a sibling tree to the post
+// content that owns the composer — hence a window event, not a provider.
 export const requestOpenPostComment = (
   detail: OpenPostCommentEventDetail,
 ): void => {
diff --git a/packages/webapp/__tests__/FooterWrapper.tsx b/packages/webapp/__tests__/FooterWrapper.tsx
index 425be0b19a1..5a64a2e3e5b 100644
--- a/packages/webapp/__tests__/FooterWrapper.tsx
+++ b/packages/webapp/__tests__/FooterWrapper.tsx
@@ -31,8 +31,6 @@ const post = { id: 'p1', type: PostType.Article } as Post;
 
 describe('FooterWrapper', () => {
   it('asks the in-page composer to open instead of mounting its own', async () => {
-    // The footer is a sibling tree to the post content that owns the composer,
-    // so the comment tap travels over a window event rather than a provider.
     const received: OpenPostCommentEventDetail[] = [];
     const listener = (event: Event): void => {
       received.push((event as CustomEvent<OpenPostCommentEventDetail>).detail);
diff --git a/packages/webapp/__tests__/PostPage.tsx b/packages/webapp/__tests__/PostPage.tsx
index a89033ef936..57424c06889 100644
--- a/packages/webapp/__tests__/PostPage.tsx
+++ b/packages/webapp/__tests__/PostPage.tsx
@@ -555,8 +555,6 @@ it('should open the comment composer inline on the page', async () => {
 });
 
 it('should open the comment composer when the mobile floating bar requests it', async () => {
-  // The mobile floating bar lives in the layout footer and reaches this
-  // composer over a window event; the listener must ignore other posts.
   renderPost();
   await screen.findByText('Learn SQL');
 

From 352d05db78cdda370b54dde3758fd6c8816229c5 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 00:57:10 +0300
Subject: [PATCH 06/12] test(share): cover the discussion share row's composer
 trigger

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../post/focus/DiscussionShareRow.spec.tsx    | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx

diff --git a/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx b/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx
new file mode 100644
index 00000000000..15f037faf08
--- /dev/null
+++ b/packages/shared/src/components/post/focus/DiscussionShareRow.spec.tsx
@@ -0,0 +1,104 @@
+import type { RenderResult } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React from 'react';
+import nock from 'nock';
+import Post from '../../../../__tests__/fixture/post';
+import loggedUser from '../../../../__tests__/fixture/loggedUser';
+import { generateTestSquad } from '../../../../__tests__/fixture/squads';
+import { settingsContext } from '../../../../__tests__/helpers/boot';
+import { AuthContextProvider } from '../../../contexts/AuthContext';
+import SettingsContext from '../../../contexts/SettingsContext';
+import { NotificationsContextProvider } from '../../../contexts/NotificationsContext';
+import { LazyModalElement } from '../../modals/LazyModalElement';
+import { DiscussionShareRow } from './DiscussionShareRow';
+
+const defaultPost = Post;
+
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: true,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(),
+    removeListener: jest.fn(),
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
+beforeEach(() => {
+  nock.cleanAll();
+  jest.clearAllMocks();
+});
+
+const squads = Array.from({ length: 6 }, (_, index) =>
+  generateTestSquad({
+    id: `squad-${index}`,
+    handle: `webteam-${index}`,
+    name: `Web team ${index}`,
+  }),
+);
+
+const renderComponent = (withSquads = true): RenderResult => {
+  const client = new QueryClient();
+
+  return render(
+    <QueryClientProvider client={client}>
+      <AuthContextProvider
+        user={loggedUser}
+        updateUser={jest.fn()}
+        tokenRefreshed
+        getRedirectUri={jest.fn()}
+        loadingUser={false}
+        loadedUserFromCache
+        squads={squads}
+      >
+        <SettingsContext.Provider value={settingsContext}>
+          <NotificationsContextProvider>
+            <LazyModalElement />
+            <DiscussionShareRow post={defaultPost} withSquads={withSquads} />
+          </NotificationsContextProvider>
+        </SettingsContext.Provider>
+      </AuthContextProvider>
+    </QueryClientProvider>,
+  );
+};
+
+describe('DiscussionShareRow', () => {
+  it('opens the share composer seeded with the post when a squad is clicked', async () => {
+    renderComponent();
+
+    screen.getByRole('button', { name: 'Share to Web team 0' }).click();
+
+    await waitFor(() => {
+      expect(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+      ).toBeInTheDocument();
+    });
+    expect(screen.getByRole('textbox', { name: 'Link URL' })).toHaveValue(
+      defaultPost.permalink,
+    );
+  });
+
+  it('caps the inline squads at four', () => {
+    renderComponent();
+
+    expect(
+      screen.getAllByRole('button', { name: /^Share to Web team/ }),
+    ).toHaveLength(4);
+  });
+
+  it('shows no squad avatars unless asked for them', () => {
+    renderComponent(false);
+
+    expect(
+      screen.queryByRole('button', { name: /^Share to Web team/ }),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: 'More sharing options' }),
+    ).toBeInTheDocument();
+  });
+});

From b998f0aaea6f9f8de6d8f24438ae4619e406e33d Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 01:14:22 +0300
Subject: [PATCH 07/12] fix(composer): harden the review findings from the
 full-PR pass

- share-edit save now shows its in-flight state (isUpdatePostLoading joins
  isPosting)
- the mobile composer drawer portals to the root, so opening it from the
  Share modal's drawer no longer traps it in a transformed ancestor
- editing always targets the post's own source instead of falling back to
  the personal audience when the squad is no longer postable
- a moderated share edit is no longer logged as a post creation
- the share-edit dirty check trims like the seed comparison does
- a locked link with no surviving shared post renders no empty preview card
- CommentMarkdownInput skips the visualViewport subscription when it fills
  its container (the value was discarded)
- the locked-link no-refetch spec now actually exercises the guard

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../CommentMarkdownInput.spec.tsx             | 28 ++++++++---
 .../MarkdownInput/CommentMarkdownInput.tsx    |  2 +-
 .../modals/post/SmartComposerModal.spec.tsx   | 47 +++++++++++++++++++
 .../modals/post/SmartComposerModal.tsx        | 15 ++++--
 .../post/composer/LinkForm.spec.tsx           | 23 ++++++++-
 .../src/components/post/composer/LinkForm.tsx |  7 ++-
 .../src/hooks/squads/usePostToSquad.tsx       |  4 +-
 7 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
index 50e4b24225a..065610a702d 100644
--- a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
+++ b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.spec.tsx
@@ -43,15 +43,17 @@ const renderComposer = (
   );
 
 const setViewportHeight = (height: number) => {
+  const viewport = {
+    height,
+    width: 375,
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+  };
   Object.defineProperty(window, 'visualViewport', {
     configurable: true,
-    value: {
-      height,
-      width: 375,
-      addEventListener: jest.fn(),
-      removeEventListener: jest.fn(),
-    },
+    value: viewport,
   });
+  return viewport;
 };
 
 describe('CommentMarkdownInput', () => {
@@ -80,6 +82,20 @@ describe('CommentMarkdownInput', () => {
     expect(screen.getByRole('form')).toHaveStyle({ maxHeight: '512px' });
   });
 
+  it('does not subscribe to viewport churn when it fills its container', () => {
+    const viewport = setViewportHeight(800);
+    renderComposer({ fills: true });
+
+    expect(viewport.addEventListener).not.toHaveBeenCalled();
+  });
+
+  it('subscribes to the viewport when capped against it', () => {
+    const viewport = setViewportHeight(800);
+    renderComposer();
+
+    expect(viewport.addEventListener).toHaveBeenCalled();
+  });
+
   it('moves the actions into a pinned bottom bar instead of the footer', () => {
     setViewportHeight(800);
     renderComposer();
diff --git a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
index e801d576f20..999959ca01c 100644
--- a/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
+++ b/packages/shared/src/components/fields/MarkdownInput/CommentMarkdownInput.tsx
@@ -81,7 +81,7 @@ export function CommentMarkdownInputComponent(
   const richTextRef = useRef<RichTextInputRef | null>(null);
   const [isMarkdownMode, setIsMarkdownMode] = useState(false);
 
-  const { height: viewportHeight } = useVisualViewport();
+  const { height: viewportHeight } = useVisualViewport(!fills);
   const maxHeight =
     viewportHeight && !fills
       ? Math.min(
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 616dbd47fc8..d1d76e29854 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -236,6 +236,17 @@ describe('SmartComposerModal', () => {
     );
   });
 
+  it('portals the mobile drawer to the root, away from transformed ancestors', () => {
+    jest.mocked(useViewSize).mockReturnValue(false);
+
+    const { container } = renderWithClient(
+      <SmartComposerModal isOpen onRequestClose={onRequestClose} />,
+    );
+
+    expect(container.querySelector('#smart_composer')).toBeNull();
+    expect(document.getElementById('smart_composer')).toBeInTheDocument();
+  });
+
   it('hides the expand control on mobile, where it is already full-screen', () => {
     jest.mocked(useViewSize).mockReturnValue(false);
 
@@ -436,6 +447,42 @@ describe('SmartComposerModal', () => {
       expect(hookProps?.editPostId).toBe('post-1');
     });
 
+    it('targets the post source even when it is not a postable audience', () => {
+      // The audience list only holds squads the user can currently post to;
+      // an edit must never retarget to the personal-source fallback.
+      const foreignSource = { id: 'left-squad', handle: 'left' };
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={{ ...editShare, source: foreignSource } as unknown as Post}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      const hookProps = jest.mocked(useComposerSubmit).mock.calls[0]?.[0];
+      expect(hookProps?.primary).toBe(foreignSource);
+      expect(hookProps?.isMulti).toBe(false);
+    });
+
+    it('treats a trailing space as no change to the commentary', async () => {
+      renderWithClient(
+        <SmartComposerModal
+          isOpen
+          editPost={editShare}
+          onRequestClose={onRequestClose}
+        />,
+      );
+
+      fireEvent.change(
+        screen.getByRole('textbox', { name: 'Post commentary' }),
+        { target: { value: 'My take on this ' } },
+      );
+      fireEvent.click(screen.getByRole('button', { name: 'Close composer' }));
+
+      await waitFor(() => expect(onRequestClose).toHaveBeenCalledTimes(1));
+      expect(showPrompt).not.toHaveBeenCalled();
+    });
+
     it('offers an empty commentary when the share never had one', () => {
       // A share posted without commentary carries the shared post's title,
       // which is not the author's words and must not be presented as theirs.
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index aca5972ccaa..97076cf8132 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -219,7 +219,7 @@ export function SmartComposerModal({
 
   const isDirty = useMemo(() => {
     if (editShare) {
-      return link.commentary !== editShareCommentary;
+      return link.commentary.trim() !== editShareCommentary.trim();
     }
     if (editPost) {
       if (text.title !== (editPost.title ?? '')) {
@@ -385,8 +385,15 @@ export function SmartComposerModal({
       initialSquadHandle,
       initialSquadId ?? editPost?.source?.id,
     );
-  const primary = selected[0];
-  const isMulti = selected.length > 1;
+  // An edit always targets the post's own source. The audience list only
+  // holds squads the user can currently post to, and falling back to the
+  // personal source would silently retarget the edit.
+  const editSource = editPost
+    ? audiences.find((audience) => audience.id === editPost.source?.id) ??
+      (editPost.source as Squad)
+    : undefined;
+  const primary = editSource ?? selected[0];
+  const isMulti = !editPost && selected.length > 1;
 
   const schedule = useSchedulePost();
   const canSchedule =
@@ -690,6 +697,8 @@ export function SmartComposerModal({
       <Drawer
         isOpen
         isFullScreen
+        // Transformed ancestors (the Share modal's drawer) trap position: fixed
+        appendOnRoot
         position={DrawerPosition.Bottom}
         onClose={() => {
           handleClose();
diff --git a/packages/shared/src/components/post/composer/LinkForm.spec.tsx b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
index bc7ad494945..18436185c2d 100644
--- a/packages/shared/src/components/post/composer/LinkForm.spec.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.spec.tsx
@@ -17,8 +17,13 @@ jest.mock('../../../hooks/input', () => ({
   ],
 }));
 
+const mockWriteLinkPreview = jest.fn();
+
 jest.mock('../write/WriteLinkPreview', () => ({
-  WriteLinkPreview: () => null,
+  WriteLinkPreview: (props: unknown) => {
+    mockWriteLinkPreview(props);
+    return null;
+  },
 }));
 
 jest.mock('../write/WritePreviewSkeleton', () => ({
@@ -29,12 +34,14 @@ const renderLinkForm = ({
   initialValue = DEFAULT_LINK,
   onSubmit = jest.fn(),
   isUrlLocked = false,
+  initialUrl,
   preview,
 }: {
   initialValue?: LinkFormState;
   onSubmit?: jest.Mock;
   isUrlLocked?: boolean;
-  preview?: { url: string; title: string };
+  initialUrl?: string;
+  preview?: { url?: string; title?: string };
 } = {}) => {
   const fetchPreview = jest.fn();
 
@@ -53,6 +60,7 @@ const renderLinkForm = ({
           onChange={setValue}
           fetchPreview={fetchPreview}
           isUrlLocked={isUrlLocked}
+          initialUrl={initialUrl}
           preview={preview}
         />
         <button type="submit">Post</button>
@@ -66,6 +74,10 @@ const renderLinkForm = ({
 };
 
 describe('LinkForm', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('collapses pasted commentary newlines into spaces', () => {
     renderLinkForm();
 
@@ -147,6 +159,7 @@ describe('LinkForm', () => {
     const lockedProps = {
       isUrlLocked: true,
       initialValue: { url: 'https://daily.dev/posts/shared', commentary: 'hi' },
+      initialUrl: 'https://daily.dev/posts/shared',
       preview: { url: 'https://daily.dev/posts/shared', title: 'Shared' },
     };
 
@@ -174,5 +187,11 @@ describe('LinkForm', () => {
 
       expect(fetchPreview).not.toHaveBeenCalled();
     });
+
+    it('shows no preview card when the shared post is gone', () => {
+      renderLinkForm({ ...lockedProps, preview: {} });
+
+      expect(mockWriteLinkPreview).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/packages/shared/src/components/post/composer/LinkForm.tsx b/packages/shared/src/components/post/composer/LinkForm.tsx
index 4485e4794b0..210c77b56bc 100644
--- a/packages/shared/src/components/post/composer/LinkForm.tsx
+++ b/packages/shared/src/components/post/composer/LinkForm.tsx
@@ -77,8 +77,13 @@ export const LinkForm = ({
     onDismissPreview?.();
   };
 
+  const hasPreviewContent = !!(
+    preview?.title ||
+    preview?.url ||
+    preview?.permalink
+  );
   const showPreview =
-    isUrlLocked ||
+    (isUrlLocked && hasPreviewContent) ||
     (isPreviewForComposerUrl(preview, value.url) && !isDismissedForCurrentUrl);
   const showSkeleton =
     !isUrlLocked && isLoadingPreview && !isDismissedForCurrentUrl;
diff --git a/packages/shared/src/hooks/squads/usePostToSquad.tsx b/packages/shared/src/hooks/squads/usePostToSquad.tsx
index fa13a146e63..8a7fdf91deb 100644
--- a/packages/shared/src/hooks/squads/usePostToSquad.tsx
+++ b/packages/shared/src/hooks/squads/usePostToSquad.tsx
@@ -371,6 +371,7 @@ export const usePostToSquad = ({
     isLinkLoading ||
     isPostModerationLoading ||
     isEditLoading ||
+    isUpdatePostLoading ||
     isPollLoading ||
     isLoadingFreeform;
 
@@ -463,7 +464,8 @@ export const usePostToSquad = ({
       const squadId = getSquadIdOrThrow(squad);
 
       if (moderationRequired(squad)) {
-        moderationCreationRef.current = PostType.Share;
+        // An edit, not a creation — must not log as one.
+        moderationCreationRef.current = null;
         return onCreatePostModeration({
           postId,
           type: PostType.Share,

From 194a5ba7608128ead82616b6f4d89ef935acfd01 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 01:21:00 +0300
Subject: [PATCH 08/12] fix(composer): unblock title-only edits and desktop
 comment autofocus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Live verification found two defects: a freeform post with no body (title +
cover) could never save a title edit because submit demanded a body, and
the desktop 'Add a comment' composer opened unfocused — the by-id focus
helper races the lazy chunk and TipTap's async editor, so the composer now
owns its focus through the queued autofocus path.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../src/components/post/NewComment.spec.tsx   | 28 +++++++++++++++++--
 .../shared/src/components/post/NewComment.tsx |  5 +++-
 .../post/composer/useComposerSubmit.spec.tsx  | 21 ++++++++++++++
 .../post/composer/useComposerSubmit.ts        |  4 ++-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/packages/shared/src/components/post/NewComment.spec.tsx b/packages/shared/src/components/post/NewComment.spec.tsx
index ef22d18115e..7e039c965f2 100644
--- a/packages/shared/src/components/post/NewComment.spec.tsx
+++ b/packages/shared/src/components/post/NewComment.spec.tsx
@@ -44,9 +44,12 @@ jest.mock('../image/Image', () => ({
   Image: () => null,
 }));
 
-const CommentInput = ({ inputId }: { inputId: string }): React.ReactElement => (
-  <div data-testid="comment-input" id={inputId} tabIndex={-1} />
-);
+const mockCommentInputProps = jest.fn();
+
+const CommentInput = (props: { inputId: string }): React.ReactElement => {
+  mockCommentInputProps(props);
+  return <div data-testid="comment-input" id={props.inputId} tabIndex={-1} />;
+};
 
 describe('NewComment', () => {
   const originalRequestAnimationFrame = window.requestAnimationFrame;
@@ -84,4 +87,23 @@ describe('NewComment', () => {
       expect(screen.getByTestId('comment-input')).toHaveFocus();
     });
   });
+
+  it('lets the composer own its focus, since its editor mounts async', () => {
+    // The by-id focus helper can fire before the lazy editor exists; the
+    // composer's queued autofocus is what reliably lands.
+    render(
+      <NewComment
+        post={{ id: 'post-1' } as never}
+        CommentInput={CommentInput}
+      />,
+    );
+
+    fireEvent.click(
+      screen.getByRole('button', { name: /share your thoughts/i }),
+    );
+
+    expect(mockCommentInputProps).toHaveBeenCalledWith(
+      expect.objectContaining({ autoFocus: true }),
+    );
+  });
 });
diff --git a/packages/shared/src/components/post/NewComment.tsx b/packages/shared/src/components/post/NewComment.tsx
index b77b7fc0566..d692f224dca 100644
--- a/packages/shared/src/components/post/NewComment.tsx
+++ b/packages/shared/src/components/post/NewComment.tsx
@@ -159,7 +159,10 @@ function NewCommentComponent(
         {...props}
         post={post}
         inputId={inputId}
-        autoFocus={false}
+        // The editor mounts async (lazy chunk + deferred TipTap creation), so
+        // focus must ride the composer's queued focus; the by-id helper below
+        // only scrolls and can fire before the editor exists.
+        autoFocus
         className={{ container: 'my-4' }}
         onCommented={onSuccess}
         initialContent={inputContent}
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
index a59608fdda6..c891f482116 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
@@ -104,4 +104,25 @@ describe('useComposerSubmit editing a share', () => {
 
     expect(result.current.isSubmitDisabled).toBe(true);
   });
+
+  it('lets a title-only freeform edit save without a body', () => {
+    // Freeform posts can exist with just a title and cover; gating the edit
+    // on a body made their titles uneditable.
+    const { result } = renderSubmit({
+      kind: 'text',
+      text: { title: 'Just a title', body: '' },
+    });
+
+    expect(result.current.isSubmitDisabled).toBe(false);
+  });
+
+  it('still requires a body when creating a freeform post', () => {
+    const { result } = renderSubmit({
+      kind: 'text',
+      text: { title: 'Just a title', body: '' },
+      editPostId: undefined,
+    });
+
+    expect(result.current.isSubmitDisabled).toBe(true);
+  });
 });
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.ts b/packages/shared/src/components/post/composer/useComposerSubmit.ts
index b34bf0b8034..9dd13d7ea32 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.ts
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.ts
@@ -175,7 +175,9 @@ export const useComposerSubmit = ({
       return true;
     }
     if (kind === 'text') {
-      return !isTextValid(text);
+      // Freeform posts can legitimately have no body (title + cover only),
+      // so an edit only requires the title.
+      return editPostId ? !text.title.trim() : !isTextValid(text);
     }
     if (kind === 'link') {
       // Editing keeps the original link — there is no URL/preview to validate.

From 439cb67663cbf353a72a5c5ec033c1623d2f2bdc Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 01:21:29 +0300
Subject: [PATCH 09/12] chore: appease react/destructuring-assignment in
 NewComment spec

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 packages/shared/src/components/post/NewComment.spec.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/shared/src/components/post/NewComment.spec.tsx b/packages/shared/src/components/post/NewComment.spec.tsx
index 7e039c965f2..369fba42315 100644
--- a/packages/shared/src/components/post/NewComment.spec.tsx
+++ b/packages/shared/src/components/post/NewComment.spec.tsx
@@ -48,7 +48,8 @@ const mockCommentInputProps = jest.fn();
 
 const CommentInput = (props: { inputId: string }): React.ReactElement => {
   mockCommentInputProps(props);
-  return <div data-testid="comment-input" id={props.inputId} tabIndex={-1} />;
+  const { inputId } = props;
+  return <div data-testid="comment-input" id={inputId} tabIndex={-1} />;
 };
 
 describe('NewComment', () => {

From 85c10661e6b66d144242346ffe48ea5c5b808946 Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 01:40:16 +0300
Subject: [PATCH 10/12] test(composer): assert the drawer portal without
 container methods

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../modals/post/SmartComposerModal.spec.tsx           | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index d1d76e29854..624fabd05a8 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -239,12 +239,15 @@ describe('SmartComposerModal', () => {
   it('portals the mobile drawer to the root, away from transformed ancestors', () => {
     jest.mocked(useViewSize).mockReturnValue(false);
 
-    const { container } = renderWithClient(
-      <SmartComposerModal isOpen onRequestClose={onRequestClose} />,
+    renderWithClient(
+      <div data-testid="host">
+        <SmartComposerModal isOpen onRequestClose={onRequestClose} />
+      </div>,
     );
 
-    expect(container.querySelector('#smart_composer')).toBeNull();
-    expect(document.getElementById('smart_composer')).toBeInTheDocument();
+    const form = document.getElementById('smart_composer');
+    expect(form).toBeInTheDocument();
+    expect(screen.getByTestId('host')).not.toContainElement(form);
   });
 
   it('hides the expand control on mobile, where it is already full-screen', () => {

From 3c3ca9490d9fa4e8c24e3cb895c3fc423b0b83bb Mon Sep 17 00:00:00 2001
From: Tsahi Matsliah <tsmatliah@gmail.com>
Date: Wed, 5 Aug 2026 09:20:26 +0300
Subject: [PATCH 11/12] chore(composer): second commentary trim

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shared/src/components/comments/CommentInput.spec.tsx    | 1 -
 packages/shared/src/components/drawers/Drawer.spec.tsx      | 2 --
 .../fields/RichTextEditor/RichTextToolbar.spec.tsx          | 2 --
 packages/shared/src/components/fields/RichTextInput.tsx     | 1 -
 packages/shared/src/components/fields/Switch.spec.tsx       | 3 ---
 .../src/components/modals/post/SmartComposerModal.spec.tsx  | 2 --
 .../src/components/modals/post/SmartComposerModal.tsx       | 6 ++----
 packages/shared/src/components/post/NewComment.spec.tsx     | 2 --
 packages/shared/src/components/post/NewComment.tsx          | 5 ++---
 .../src/components/post/composer/useComposerSubmit.spec.tsx | 3 ---
 packages/shared/src/hooks/utils/useVisualViewport.spec.tsx  | 5 -----
 11 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/packages/shared/src/components/comments/CommentInput.spec.tsx b/packages/shared/src/components/comments/CommentInput.spec.tsx
index effb09b2099..e26aff48d79 100644
--- a/packages/shared/src/components/comments/CommentInput.spec.tsx
+++ b/packages/shared/src/components/comments/CommentInput.spec.tsx
@@ -58,7 +58,6 @@ describe('CommentInput', () => {
     expect(mockDrawerProps).toHaveBeenCalledWith(
       expect.objectContaining({
         isFullScreen: true,
-        // Animated ancestors trap position:fixed, so the drawer must portal.
         appendOnRoot: true,
       }),
     );
diff --git a/packages/shared/src/components/drawers/Drawer.spec.tsx b/packages/shared/src/components/drawers/Drawer.spec.tsx
index ed8f5f6b2d7..c6985af5635 100644
--- a/packages/shared/src/components/drawers/Drawer.spec.tsx
+++ b/packages/shared/src/components/drawers/Drawer.spec.tsx
@@ -42,7 +42,6 @@ describe('Drawer', () => {
   });
 
   it('locks the page scroll behind it while open', () => {
-    // <html> is the page's actual scroller — the body class alone is not enough.
     const { unmount } = render(
       <Drawer isOpen isFullScreen onClose={jest.fn()}>
         content
@@ -117,7 +116,6 @@ describe('Drawer', () => {
   });
 
   it('closes only on a direct backdrop hit, not on bubbled child clicks', () => {
-    // Portaled dropdowns bubble synthetic clicks up the React tree.
     jest.useFakeTimers();
     const onClose = jest.fn();
     render(
diff --git a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
index a42413d2656..66a86d32d5a 100644
--- a/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
+++ b/packages/shared/src/components/fields/RichTextEditor/RichTextToolbar.spec.tsx
@@ -85,8 +85,6 @@ describe('RichTextToolbar leading actions', () => {
   });
 
   it('moves overflowed formatting into the menu with a working trigger', () => {
-    // The tooltip must ride on the trigger's own `tooltip` prop — a `Tooltip`
-    // wrapper blurs on mouseup and dismisses the non-modal menu.
     const nativeResizeObserver = global.ResizeObserver;
     let triggerResize: (() => void) | undefined;
     const observerStub = (
diff --git a/packages/shared/src/components/fields/RichTextInput.tsx b/packages/shared/src/components/fields/RichTextInput.tsx
index 066fba54c58..8a850080db3 100644
--- a/packages/shared/src/components/fields/RichTextInput.tsx
+++ b/packages/shared/src/components/fields/RichTextInput.tsx
@@ -584,7 +584,6 @@ function RichTextInput(
         if (!textarea) {
           return;
         }
-        // Caret at the end, matching where the rich editor lands.
         textarea.focus({ preventScroll: true });
         const end = textarea.value.length;
         textarea.setSelectionRange(end, end);
diff --git a/packages/shared/src/components/fields/Switch.spec.tsx b/packages/shared/src/components/fields/Switch.spec.tsx
index 9b9c3eb420e..c8b5d60b135 100644
--- a/packages/shared/src/components/fields/Switch.spec.tsx
+++ b/packages/shared/src/components/fields/Switch.spec.tsx
@@ -24,9 +24,6 @@ describe('Switch', () => {
   });
 
   it('keeps the track full size next to a long label', () => {
-    // The global `* { flex-shrink: 0 }` reset does not apply in flex rows we
-    // build manually, so the track must opt out of shrinking itself or a long
-    // label squashes it.
     renderSwitch();
 
     const track = screen
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
index 624fabd05a8..9980c720a0e 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.spec.tsx
@@ -451,8 +451,6 @@ describe('SmartComposerModal', () => {
     });
 
     it('targets the post source even when it is not a postable audience', () => {
-      // The audience list only holds squads the user can currently post to;
-      // an edit must never retarget to the personal-source fallback.
       const foreignSource = { id: 'left-squad', handle: 'left' };
       renderWithClient(
         <SmartComposerModal
diff --git a/packages/shared/src/components/modals/post/SmartComposerModal.tsx b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
index 97076cf8132..738425eb92a 100644
--- a/packages/shared/src/components/modals/post/SmartComposerModal.tsx
+++ b/packages/shared/src/components/modals/post/SmartComposerModal.tsx
@@ -385,9 +385,8 @@ export function SmartComposerModal({
       initialSquadHandle,
       initialSquadId ?? editPost?.source?.id,
     );
-  // An edit always targets the post's own source. The audience list only
-  // holds squads the user can currently post to, and falling back to the
-  // personal source would silently retarget the edit.
+  // An edit must target the post's own source — the audience list only holds
+  // currently postable squads, and its fallback would silently retarget.
   const editSource = editPost
     ? audiences.find((audience) => audience.id === editPost.source?.id) ??
       (editPost.source as Squad)
@@ -677,7 +676,6 @@ export function SmartComposerModal({
           {kind === 'poll' && <PollForm value={poll} onChange={setPoll} />}
         </div>
       )}
-      {/* Text keeps its actions inside the editor's own bottom bar. */}
       {kind !== 'text' && kind !== 'standup' && (
         <div className="flex shrink-0 flex-col gap-3 px-5 pb-5 pt-4">
           <div className="flex items-center justify-between gap-3">
diff --git a/packages/shared/src/components/post/NewComment.spec.tsx b/packages/shared/src/components/post/NewComment.spec.tsx
index 369fba42315..fae960f3739 100644
--- a/packages/shared/src/components/post/NewComment.spec.tsx
+++ b/packages/shared/src/components/post/NewComment.spec.tsx
@@ -90,8 +90,6 @@ describe('NewComment', () => {
   });
 
   it('lets the composer own its focus, since its editor mounts async', () => {
-    // The by-id focus helper can fire before the lazy editor exists; the
-    // composer's queued autofocus is what reliably lands.
     render(
       <NewComment
         post={{ id: 'post-1' } as never}
diff --git a/packages/shared/src/components/post/NewComment.tsx b/packages/shared/src/components/post/NewComment.tsx
index d692f224dca..7c0ad1aa51d 100644
--- a/packages/shared/src/components/post/NewComment.tsx
+++ b/packages/shared/src/components/post/NewComment.tsx
@@ -159,9 +159,8 @@ function NewCommentComponent(
         {...props}
         post={post}
         inputId={inputId}
-        // The editor mounts async (lazy chunk + deferred TipTap creation), so
-        // focus must ride the composer's queued focus; the by-id helper below
-        // only scrolls and can fire before the editor exists.
+        // The editor mounts async (lazy chunk + deferred TipTap creation);
+        // the by-id helper below can fire before it exists, so it only scrolls.
         autoFocus
         className={{ container: 'my-4' }}
         onCommented={onSuccess}
diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
index c891f482116..2627ed169df 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.spec.tsx
@@ -93,7 +93,6 @@ describe('useComposerSubmit editing a share', () => {
   });
 
   it('stays submittable without a resolved preview', () => {
-    // The link is fixed while editing — there is no URL/preview to validate.
     const { result } = renderSubmit();
 
     expect(result.current.isSubmitDisabled).toBe(false);
@@ -106,8 +105,6 @@ describe('useComposerSubmit editing a share', () => {
   });
 
   it('lets a title-only freeform edit save without a body', () => {
-    // Freeform posts can exist with just a title and cover; gating the edit
-    // on a body made their titles uneditable.
     const { result } = renderSubmit({
       kind: 'text',
       text: { title: 'Just a title', body: '' },
diff --git a/packages/shared/src/hooks/utils/useVisualViewport.spec.tsx b/packages/shared/src/hooks/utils/useVisualViewport.spec.tsx
index 459f8145852..8f8676e96a2 100644
--- a/packages/shared/src/hooks/utils/useVisualViewport.spec.tsx
+++ b/packages/shared/src/hooks/utils/useVisualViewport.spec.tsx
@@ -51,8 +51,6 @@ describe('useVisualViewport', () => {
   });
 
   it('does not subscribe when disabled', () => {
-    // `scroll` fires continuously on iOS while the keyboard is open, so
-    // consumers that only read the value in some states opt out of the churn.
     render(<Viewport enabled={false} />);
 
     viewport.height = 500;
@@ -64,9 +62,6 @@ describe('useVisualViewport', () => {
   });
 
   it('tracks iOS panning the layout viewport under the keyboard', () => {
-    // iOS scrolls the layout viewport instead of resizing it, which fires
-    // `scroll` (not `resize`) and moves `offsetTop` — the value fixed overlays
-    // need to stay on screen.
     render(<Viewport />);
 
     viewport.offsetTop = 40;

From 54de29b6735ab790f36d57912c674eb5cf24a1c5 Mon Sep 17 00:00:00 2001
From: Chris Bongers <chrisbongers@gmail.com>
Date: Thu, 27 Aug 2026 16:12:20 +0200
Subject: [PATCH 12/12] fix(composer): keep title-only freeform edits after
 syncing base

The base branch backed the edit-validation relaxation out of the comments
PR; it belongs here, where useComposerSubmit.spec covers it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../shared/src/components/post/composer/useComposerSubmit.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/shared/src/components/post/composer/useComposerSubmit.ts b/packages/shared/src/components/post/composer/useComposerSubmit.ts
index b50f6c6b0e9..ef868fbd0a5 100644
--- a/packages/shared/src/components/post/composer/useComposerSubmit.ts
+++ b/packages/shared/src/components/post/composer/useComposerSubmit.ts
@@ -176,7 +176,9 @@ export const useComposerSubmit = ({
       return true;
     }
     if (kind === 'text') {
-      return !isTextValid(text);
+      // Freeform posts can legitimately have no body (title + cover only),
+      // so an edit only requires the title.
+      return editPostId ? !text.title.trim() : !isTextValid(text);
     }
     if (kind === 'link') {
       // Editing keeps the original link — there is no URL/preview to validate.