Skip to content

Switch to opt-in digit grouping #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eluberoff merged 2 commits into from
Mar 10, 2026
Merged

Switch to opt-in digit grouping #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5eff9b
switch to opt-in digit grouping
eluberoff Mar 6, 2026
4557b2d
synchronously set ellipses
eluberoff Mar 10, 2026
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
3 changes: 3 additions & 0 deletions src/commands/math.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,9 @@ API.StaticMath = function (APIClasses: APIClasses) {
this.config(opts as MathQuill.v3.Config);
// `mathquillify` calls `createTextarea`
super.mathquillify('mq-math-mode');
if (this.__options.enableDigitGrouping) {
this.__controller.root.domFrag().addClass('mq-show-grouping');
Copy link
Copy Markdown
Member Author

@eluberoff eluberoff Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the key win here: static math immediately shows digit grouping, and editing around it doesn't impact it

}
this.__controller.setupStaticField();
if (this.__options.mouseEvents) {
this.__controller.addMouseEventListener();
Expand Down
42 changes: 16 additions & 26 deletions src/css/math.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,28 @@
margin-right: @expand-margin;
}

.mq-group-start {
margin-left: @digit-separator;
margin-right: @contract-margin;
}

.mq-group-other {
margin-left: @contract-margin;
margin-right: @contract-margin;
}

.mq-group-leading-1,
.mq-group-leading-2 {
margin-left: 0;
margin-right: @contract-margin;
}
&.mq-show-grouping {
.mq-group-start {
margin-left: @digit-separator;
margin-right: @contract-margin;
}

.mq-group-leading-3 {
margin-left: 4 * @expand-margin;
margin-right: @contract-margin;
}
.mq-group-other {
margin-left: @contract-margin;
margin-right: @contract-margin;
}

&.mq-suppress-grouping {
.mq-group-start,
.mq-group-other,
.mq-group-leading-1,
.mq-group-leading-2,
.mq-group-leading-2 {
margin-left: 0;
margin-right: @contract-margin;
}

.mq-group-leading-3 {
margin-left: @expand-margin;
margin-right: @expand-margin;
margin-left: 4 * @expand-margin;
margin-right: @contract-margin;
}
}

.mq-ellipsis-start {
margin-left: @ellipsis-separator;
margin-right: @ellipsis-internal-sep;
Expand Down
28 changes: 15 additions & 13 deletions src/services/focusBlur.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,21 @@ ControllerBase.onNotify(function (cursor, e) {
// blurred === undefined means we are not focused.
if (controller.blurred !== false) return;

controller.disableGroupingForSeconds(1);
controller.hideGroupingForEdit();
}
});

class Controller_focusBlur extends Controller_exportText {
blurred: boolean;
__disableGroupingTimeout: number;
__showGroupingTimeout: number;
textareaSelectionTimeout: number;

disableGroupingForSeconds(seconds: number) {
clearTimeout(this.__disableGroupingTimeout);
if (seconds === 0) {
this.root.domFrag().removeClass('mq-suppress-grouping');
} else {
this.root.domFrag().addClass('mq-suppress-grouping');
this.__disableGroupingTimeout = setTimeout(() => {
this.root.domFrag().removeClass('mq-suppress-grouping');
}, seconds * 1000);
}
hideGroupingForEdit() {
clearTimeout(this.__showGroupingTimeout);
this.root.domFrag().removeClass('mq-show-grouping');
this.__showGroupingTimeout = setTimeout(() => {
this.root.domFrag().addClass('mq-show-grouping');
}, 1000);
}

private blurTimeout: number;
Expand All @@ -55,7 +51,10 @@ class Controller_focusBlur extends Controller_exportText {
clearTimeout(this.textareaSelectionTimeout);
this.textareaSelectionTimeout = 0;
}
this.disableGroupingForSeconds(0);
if (this.options.enableDigitGrouping) {
clearTimeout(this.__showGroupingTimeout);
this.root.domFrag().addClass('mq-show-grouping');
}
this.blurred = true;
this.blurTimeout = setTimeout(() => {
// wait for blur on window; if
Expand Down Expand Up @@ -114,6 +113,9 @@ class Controller_focusBlur extends Controller_exportText {
});
ctrlr.blurred = true;
cursor.hide().parent.blur(cursor);
if (ctrlr.options.enableDigitGrouping) {
ctrlr.root.domFrag().addClass('mq-show-grouping');
}
}

addStaticFocusBlurListeners() {
Expand Down
Loading