From 0dfcf05523cb981442bc83069b38ca8aa9b62737 Mon Sep 17 00:00:00 2001 From: Milan Pramod Date: Fri, 13 Nov 2026 21:40:52 +0530 Subject: [PATCH 1/3] feat(config): add select_after_create option for shape and text creation --- src-tauri/src/config.rs | 7 ++ src-tauri/src/lua_engine.rs | 19 +++++ src-tauri/src/lua_generator.rs | 8 ++- src-tauri/src/watcher.rs | 1 + src/components/settings/GeneralTab.test.tsx | 14 ++++ src/components/settings/GeneralTab.tsx | 62 ++++++++++++++++ src/core/engine/textCommit.test.ts | 80 +++++++++++++++++++++ src/core/engine/textCommit.ts | 8 ++- src/core/input/PointerRouter.test.ts | 51 +++++++++++++ src/core/input/PointerRouter.ts | 9 ++- src/stores/useConfigStore.ts | 2 + 11 files changed, 258 insertions(+), 3 deletions(-) create mode 100644 src/core/engine/textCommit.test.ts diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 2d67bd2..27eff1c 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -11,12 +11,18 @@ pub struct AppOptions { pub auto_save: bool, #[serde(default = "default_pen_color_val")] pub default_pen_color: String, + #[serde(default = "default_select_after_create_val")] + pub select_after_create: bool, } fn default_pen_color_val() -> String { "#0284c7".to_string() } +fn default_select_after_create_val() -> bool { + true +} + impl Default for AppOptions { fn default() -> Self { Self { @@ -27,6 +33,7 @@ impl Default for AppOptions { stroke_thinning: 0.6, auto_save: true, default_pen_color: "#0284c7".to_string(), + select_after_create: true, } } } diff --git a/src-tauri/src/lua_engine.rs b/src-tauri/src/lua_engine.rs index adc4c5b..c32fc27 100644 --- a/src-tauri/src/lua_engine.rs +++ b/src-tauri/src/lua_engine.rs @@ -189,6 +189,9 @@ pub fn eval_lua_config_string( default.options.default_pen_color.clone(), ) .map_err(|e| e.to_string())?; + opt_table + .set("select_after_create", default.options.select_after_create) + .map_err(|e| e.to_string())?; scribl_table .set("opt", opt_table) .map_err(|e| e.to_string())?; @@ -361,6 +364,9 @@ pub fn eval_lua_config_string( default_pen_color: opt .get("default_pen_color") .unwrap_or(default.options.default_pen_color), + select_after_create: opt + .get("select_after_create") + .unwrap_or(default.options.select_after_create), }; // Extract keymaps and merge with defaults @@ -867,4 +873,17 @@ scribl.keymap.set("n", "", "selection.delete") let _ = std::fs::remove_dir_all(&temp_dir); } + + #[test] + fn test_eval_select_after_create_option() { + let script = r#" + local scribl = require("scribl") + scribl.opt.select_after_create = false + "#; + let config = eval_lua_config_string(script, None).expect("should evaluate"); + assert!(!config.options.select_after_create); + + let default_config = eval_lua_config_string("", None).expect("should evaluate"); + assert!(default_config.options.select_after_create); + } } diff --git a/src-tauri/src/lua_generator.rs b/src-tauri/src/lua_generator.rs index 08f4a47..7ecb6c4 100644 --- a/src-tauri/src/lua_generator.rs +++ b/src-tauri/src/lua_generator.rs @@ -39,9 +39,13 @@ pub fn generate_lua_script(config: &ScriblConfig) -> String { config.options.stroke_thinning )); out.push_str(&format!( - "scribl.opt.auto_save = {}\n\n", + "scribl.opt.auto_save = {}\n", config.options.auto_save )); + out.push_str(&format!( + "scribl.opt.select_after_create = {}\n\n", + config.options.select_after_create + )); out.push_str( "--------------------------------------------------------------------------------\n", @@ -134,12 +138,14 @@ mod tests { config.options.stroke_smoothing = 0.8; config.options.stroke_thinning = 0.4; config.options.auto_save = false; + config.options.select_after_create = false; let script = generate_lua_script(&config); assert!(script.contains("scribl.opt.dot_grid = false")); assert!(script.contains("scribl.opt.default_tool = \"eraser\"")); assert!(script.contains("scribl.opt.default_pen_color = \"#ff0077\"")); assert!(script.contains("scribl.opt.zoom_mode = \"selection\"")); + assert!(script.contains("scribl.opt.select_after_create = false")); // Round-trip verification: evaluating generated script must yield exact same config let parsed = eval_lua_config_string(&script, None).expect("generated script should parse"); diff --git a/src-tauri/src/watcher.rs b/src-tauri/src/watcher.rs index 8b87b96..fc3983e 100644 --- a/src-tauri/src/watcher.rs +++ b/src-tauri/src/watcher.rs @@ -61,6 +61,7 @@ scribl.opt.zoom_mode = "scrubby" -- "scrubby" or "selection" scribl.opt.stroke_smoothing = 0.5 -- Perfect-freehand smoothing scribl.opt.stroke_thinning = 0.6 -- Velocity thinning & taper effect scribl.opt.auto_save = true -- Automatically save drawings to local storage +scribl.opt.select_after_create = true -- Automatically select element after creating (shapes/text) -------------------------------------------------------------------------------- -- 2. Keybindings diff --git a/src/components/settings/GeneralTab.test.tsx b/src/components/settings/GeneralTab.test.tsx index 011a07a..4b4fea1 100644 --- a/src/components/settings/GeneralTab.test.tsx +++ b/src/components/settings/GeneralTab.test.tsx @@ -33,4 +33,18 @@ describe('GeneralTab', () => { expect(useConfigStore.getState().config.options.default_pen_color).toBe('#e11d48'); expect(useToolStore.getState().color).toBe('#e11d48'); }); + + it('toggles select after create option', () => { + render(); + const toggle = screen.getByRole('switch', { name: /select element after creation/i }); + expect(toggle.getAttribute('aria-checked')).toBe('true'); + + fireEvent.click(toggle); + expect(useConfigStore.getState().config.options.select_after_create).toBe(false); + expect(toggle.getAttribute('aria-checked')).toBe('false'); + + fireEvent.click(toggle); + expect(useConfigStore.getState().config.options.select_after_create).toBe(true); + expect(toggle.getAttribute('aria-checked')).toBe('true'); + }); }); diff --git a/src/components/settings/GeneralTab.tsx b/src/components/settings/GeneralTab.tsx index cecf8f9..a24dc5c 100644 --- a/src/components/settings/GeneralTab.tsx +++ b/src/components/settings/GeneralTab.tsx @@ -464,6 +464,68 @@ export const GeneralTab: React.FC = () => { /> + + {/* Select After Create Toggle */} +
+
+
+ Select Element After Creation +
+
+ Automatically select newly created shapes and text elements when switching to select + tool +
+
+ +
); diff --git a/src/core/engine/textCommit.test.ts b/src/core/engine/textCommit.test.ts new file mode 100644 index 0000000..d59bc8e --- /dev/null +++ b/src/core/engine/textCommit.test.ts @@ -0,0 +1,80 @@ +import { beforeEach, describe, expect, it } from 'vitest'; +import { DEFAULT_CONFIG, useConfigStore } from '../../stores/useConfigStore'; +import { useDocumentStore } from '../../stores/useDocumentStore'; +import { useToolStore } from '../../stores/useToolStore'; +import { commitEditingText } from './textCommit'; + +describe('commitEditingText', () => { + beforeEach(() => { + useDocumentStore.setState({ + elements: {}, + elementIds: [], + selectedIds: [], + }); + + useToolStore.setState({ + currentTool: 'text', + color: '#0284c7', + fontSize: 24, + fontFamily: 'handwritten', + editingText: null, + }); + + useConfigStore.setState({ config: DEFAULT_CONFIG }); + }); + + it('selects new text element and switches to select tool by default', () => { + useToolStore.setState({ + currentTool: 'text', + editingText: { + x: 100, + y: 100, + text: 'Hello World', + fontSize: 24, + fontFamily: 'handwritten', + color: '#0284c7', + }, + }); + + const result = commitEditingText(); + expect(result).toBe(true); + + const doc = useDocumentStore.getState(); + expect(doc.elementIds.length).toBe(1); + const newId = doc.elementIds[0]; + expect(doc.selectedIds).toEqual([newId]); + expect(useToolStore.getState().currentTool).toBe('select'); + }); + + it('switches tool to select but does not select text when select_after_create is false', () => { + useConfigStore.setState({ + config: { + ...DEFAULT_CONFIG, + options: { + ...DEFAULT_CONFIG.options, + select_after_create: false, + }, + }, + }); + + useToolStore.setState({ + currentTool: 'text', + editingText: { + x: 100, + y: 100, + text: 'Hello Unselected', + fontSize: 24, + fontFamily: 'handwritten', + color: '#0284c7', + }, + }); + + const result = commitEditingText(); + expect(result).toBe(true); + + const doc = useDocumentStore.getState(); + expect(doc.elementIds.length).toBe(1); + expect(doc.selectedIds).toEqual([]); + expect(useToolStore.getState().currentTool).toBe('select'); + }); +}); diff --git a/src/core/engine/textCommit.ts b/src/core/engine/textCommit.ts index abee0bb..fa354fb 100644 --- a/src/core/engine/textCommit.ts +++ b/src/core/engine/textCommit.ts @@ -1,3 +1,4 @@ +import { useConfigStore } from '../../stores/useConfigStore'; import { useDocumentStore } from '../../stores/useDocumentStore'; import { useToolStore } from '../../stores/useToolStore'; import { TextElement } from '../../types/canvas'; @@ -86,7 +87,12 @@ export function commitEditingText(overrideText?: string): boolean { }; doc.executeCommand(new AddElementCommand(newEl)); - doc.setSelected([newId]); + const selectAfterCreate = useConfigStore.getState().config.options.select_after_create ?? true; + if (selectAfterCreate) { + doc.setSelected([newId]); + } else { + doc.setSelected([]); + } } if (toolStore.currentTool === 'text') { diff --git a/src/core/input/PointerRouter.test.ts b/src/core/input/PointerRouter.test.ts index 73a6dcf..760a9b6 100644 --- a/src/core/input/PointerRouter.test.ts +++ b/src/core/input/PointerRouter.test.ts @@ -1,5 +1,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { useCameraStore } from '../../stores/useCameraStore'; +import { DEFAULT_CONFIG, useConfigStore } from '../../stores/useConfigStore'; import { useDocumentStore } from '../../stores/useDocumentStore'; import { useToolStore } from '../../stores/useToolStore'; import { ShapeElement, StrokeElement } from '../../types/canvas'; @@ -586,6 +587,8 @@ describe('PointerRouter - Shape Drawing', () => { strokeStyle: 'solid', editingText: null, }); + + useConfigStore.setState({ config: DEFAULT_CONFIG }); }); it('draws a rectangle and commits to document store on pointer up', () => { @@ -648,6 +651,54 @@ describe('PointerRouter - Shape Drawing', () => { expect(useToolStore.getState().currentTool).toBe('select'); }); + it('switches tool to select but leaves shape unselected when select_after_create is false', () => { + useConfigStore.setState({ + config: { + ...DEFAULT_CONFIG, + options: { + ...DEFAULT_CONFIG.options, + select_after_create: false, + }, + }, + }); + + router.handlePointerDown( + new PointerEvent('pointerdown', { + clientX: 600, + clientY: 500, + pointerId: 1, + pointerType: 'mouse', + buttons: 1, + }), + container, + ); + + router.handlePointerMove( + new PointerEvent('pointermove', { + clientX: 750, + clientY: 600, + pointerId: 1, + pointerType: 'mouse', + buttons: 1, + }), + ); + + router.handlePointerUp( + new PointerEvent('pointerup', { + clientX: 750, + clientY: 600, + pointerId: 1, + pointerType: 'mouse', + }), + container, + ); + + const doc = useDocumentStore.getState(); + expect(doc.elementIds.length).toBe(1); + expect(doc.selectedIds).toEqual([]); + expect(useToolStore.getState().currentTool).toBe('select'); + }); + it('constrains rectangle to square when Shift is held', () => { router.handlePointerDown( new PointerEvent('pointerdown', { diff --git a/src/core/input/PointerRouter.ts b/src/core/input/PointerRouter.ts index 352893a..78df34f 100644 --- a/src/core/input/PointerRouter.ts +++ b/src/core/input/PointerRouter.ts @@ -1,4 +1,5 @@ import { useCameraStore } from '../../stores/useCameraStore'; +import { useConfigStore } from '../../stores/useConfigStore'; import { useDocumentStore } from '../../stores/useDocumentStore'; import { useToolStore } from '../../stores/useToolStore'; import { @@ -582,7 +583,13 @@ export class PointerRouter { zIndex, }; useDocumentStore.getState().addElement(element); - useDocumentStore.getState().setSelected([id]); + const selectAfterCreate = useConfigStore.getState().config.options.select_after_create + ?? true; + if (selectAfterCreate) { + useDocumentStore.getState().setSelected([id]); + } else { + useDocumentStore.getState().setSelected([]); + } useToolStore.getState().setTool('select'); } this.activeShapeTool = null; diff --git a/src/stores/useConfigStore.ts b/src/stores/useConfigStore.ts index 0324a36..5ffa0b5 100644 --- a/src/stores/useConfigStore.ts +++ b/src/stores/useConfigStore.ts @@ -11,6 +11,7 @@ export interface AppOptions { stroke_thinning: number; auto_save: boolean; default_pen_color: string; + select_after_create: boolean; } export interface KeymapEntry { @@ -57,6 +58,7 @@ export const DEFAULT_CONFIG: ScriblConfig = { stroke_thinning: 0.6, auto_save: true, default_pen_color: '#0284c7', + select_after_create: true, }, keymaps: [ { mode: 'n', lhs: 'p', rhs: 'tool.pen', desc: 'Pen Tool' }, From 8cf0f202bc32a69e984c355850fff752c871e4c5 Mon Sep 17 00:00:00 2001 From: Milan Pramod Date: Fri, 13 Nov 2026 21:41:45 +0530 Subject: [PATCH 2/3] fix(config): make select_after_create optional in AppOptions interface and update SettingsModal mock --- src/components/settings/SettingsModal.test.tsx | 1 + src/stores/useConfigStore.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/settings/SettingsModal.test.tsx b/src/components/settings/SettingsModal.test.tsx index cd88448..aedfc78 100644 --- a/src/components/settings/SettingsModal.test.tsx +++ b/src/components/settings/SettingsModal.test.tsx @@ -17,6 +17,7 @@ describe('SettingsModal', () => { stroke_thinning: 0.6, auto_save: true, default_pen_color: '#0284c7', + select_after_create: true, }, keymaps: [ { mode: 'n', lhs: 'p', rhs: 'tool.pen', desc: 'Pen Tool' }, diff --git a/src/stores/useConfigStore.ts b/src/stores/useConfigStore.ts index 5ffa0b5..c571763 100644 --- a/src/stores/useConfigStore.ts +++ b/src/stores/useConfigStore.ts @@ -11,7 +11,7 @@ export interface AppOptions { stroke_thinning: number; auto_save: boolean; default_pen_color: string; - select_after_create: boolean; + select_after_create?: boolean; } export interface KeymapEntry { From c28501d604477e554aa3769d4da344df8eeb1790 Mon Sep 17 00:00:00 2001 From: Milan Pramod Date: Fri, 13 Nov 2026 21:50:52 +0530 Subject: [PATCH 3/3] style(settings): clean up auto-select toggle label and prevent switch compression --- src/components/settings/GeneralTab.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/settings/GeneralTab.tsx b/src/components/settings/GeneralTab.tsx index a24dc5c..8a87bc6 100644 --- a/src/components/settings/GeneralTab.tsx +++ b/src/components/settings/GeneralTab.tsx @@ -471,6 +471,7 @@ export const GeneralTab: React.FC = () => { display: 'flex', alignItems: 'center', justifyContent: 'space-between', + gap: 16, padding: '12px 14px', background: 'rgba(0, 0, 0, 0.05)', borderRadius: 10, @@ -481,13 +482,12 @@ export const GeneralTab: React.FC = () => {
- Select Element After Creation + Auto-Select Created Elements
- Automatically select newly created shapes and text elements when switching to select - tool + Automatically select shapes and text after creating