@remit/ui 0.0.110 → 0.0.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/ui",
-  "version": "0.0.110",
+  "version": "0.0.111",
   "type": "module",
   "files": [
     "src"

package/src/components/filter-rule-editor.stories.tsx

@@ -371,9 +371,18 @@ const openDestinationTree = async (canvasElement: HTMLElement) => {
 	await tick();
 };
 
-/** Opens a folder in the tree; tapping it both picks it and reveals its children. */
+/**
+ * Opens a folder in the tree; tapping it both picks it and reveals its
+ * children. A tap toggles, and the branch holding the rule's current
+ * destination is already open when the tree appears, so a folder that is open
+ * is left alone rather than tapped shut.
+ */
 const openFolder = async (canvasElement: HTMLElement, label: string) => {
-	clickAriaLabel(canvasElement, `Move to ${label}`);
+	const row = canvasElement.querySelector<HTMLElement>(
+		`[aria-label="Move to ${label}"]`,
+	);
+	if (!row) throw new Error(`no control labelled "Move to ${label}"`);
+	if (row.getAttribute("aria-expanded") !== "true") row.click();
 	await tick();
 };
 

package/src/components/rich-text-editor.tsx

@@ -444,13 +444,23 @@ const AutoFocus = ({ caret }: { caret?: ComposeCaret }) => {
 
 	useEffect(() => {
 		if (!caret) return;
-		const timer = setTimeout(
-			() =>
-				editor.focus(undefined, {
-					defaultSelection: caret === "start" ? "rootStart" : "rootEnd",
-				}),
-			0,
-		);
+		// Seeding the document leaves a selection behind at the end of what was
+		// inserted, and `defaultSelection` only applies where there is none — so
+		// the caret is placed here rather than left to `focus`, which would open a
+		// new message below the signature instead of above it.
+		const timer = setTimeout(() => {
+			editor.update(
+				() => {
+					const root = $getRoot();
+					if (caret === "start") {
+						root.selectStart();
+						return;
+					}
+					root.selectEnd();
+				},
+				{ onUpdate: () => editor.focus() },
+			);
+		}, 0);
 		return () => clearTimeout(timer);
 	}, [editor, caret]);