Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src-tauri/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions src-tauri/src/lua_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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())?;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -867,4 +873,17 @@ scribl.keymap.set("n", "<BS>", "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);
}
}
8 changes: 7 additions & 1 deletion src-tauri/src/lua_generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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");
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/watcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions src/components/settings/GeneralTab.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(<GeneralTab />);
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');
});
});
63 changes: 63 additions & 0 deletions src/components/settings/GeneralTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,69 @@ export const GeneralTab: React.FC = () => {
/>
</button>
</div>

{/* Select After Create Toggle */}
<div
style={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
gap: 16,
padding: '12px 14px',
background: 'rgba(0, 0, 0, 0.05)',
borderRadius: 10,
border: '1px solid var(--color-panel-border, rgba(255, 255, 255, 0.06))',
}}
>
<div>
<div
style={{ fontSize: 13, fontWeight: 500, color: 'var(--color-text-primary, #e2e8f0)' }}
>
Auto-Select Created Elements
</div>
<div
style={{ fontSize: 11, color: 'var(--color-text-secondary, #64748b)', marginTop: 2 }}
>
Automatically select shapes and text after creating
</div>
</div>
<button
type='button'
role='switch'
aria-label='Toggle select element after creation'
aria-checked={config.options.select_after_create ?? true}
onClick={() =>
updateOption('select_after_create', !(config.options.select_after_create ?? true))}
style={{
flexShrink: 0,
width: 44,
height: 24,
borderRadius: 12,
background: (config.options.select_after_create ?? true)
? 'var(--color-accent, #0284c7)'
: 'rgba(255, 255, 255, 0.15)',
border: 'none',
cursor: 'pointer',
position: 'relative',
transition: 'background 0.2s ease',
padding: 2,
}}
>
<div
style={{
width: 20,
height: 20,
borderRadius: '50%',
background: '#ffffff',
boxShadow: '0 1px 3px rgba(0,0,0,0.3)',
transform: (config.options.select_after_create ?? true)
? 'translateX(20px)'
: 'translateX(0)',
transition: 'transform 0.2s cubic-bezier(0.16, 1, 0.3, 1)',
}}
/>
</button>
</div>
</div>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/settings/SettingsModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down
80 changes: 80 additions & 0 deletions src/core/engine/textCommit.test.ts
Original file line number Diff line number Diff line change
@@ -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');
});
});
8 changes: 7 additions & 1 deletion src/core/engine/textCommit.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useConfigStore } from '../../stores/useConfigStore';
import { useDocumentStore } from '../../stores/useDocumentStore';
import { useToolStore } from '../../stores/useToolStore';
import { TextElement } from '../../types/canvas';
Expand Down Expand Up @@ -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') {
Expand Down
51 changes: 51 additions & 0 deletions src/core/input/PointerRouter.test.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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', () => {
Expand Down Expand 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', {
Expand Down
9 changes: 8 additions & 1 deletion src/core/input/PointerRouter.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading