fixed ViewGuid generation to never start with a number (enables text boxes to have css specific to a single Doc). cleaned up '%' style rules for text boxes. cleaned up custom style sheets in text boxes to only be created when needed and to improve highlighting bold text with context.

1 files changed, 6 insertions, 27 deletions

diff --git a/src/client/views/nodes/formattedText/RichTextRules.ts b/src/client/views/nodes/formattedText/RichTextRules.ts
index 04315e886..14ea911b1 100644
--- a/src/client/views/nodes/formattedText/RichTextRules.ts
+++ b/src/client/views/nodes/formattedText/RichTextRules.ts
@@ -1,7 +1,6 @@
 import { ellipsis, emDash, InputRule, smartQuotes, textblockTypeInputRule } from 'prosemirror-inputrules';
 import { NodeType } from 'prosemirror-model';
 import { NodeSelection, TextSelection } from 'prosemirror-state';
-import { ClientUtils } from '../../../../ClientUtils';
 import { Doc, DocListCast, FieldResult, StrListCast } from '../../../../fields/Doc';
 import { DocData } from '../../../../fields/DocSymbols';
 import { Id } from '../../../../fields/FieldSymbols';
@@ -21,7 +20,6 @@ import { schema } from './schema_rts';
 export class RichTextRules {
     public Document: Doc;
     public TextBox: FormattedTextBox;
-    public EnteringStyle: boolean = false;
     constructor(doc: Doc, textBox: FormattedTextBox) {
         this.Document = doc;
         this.TextBox = textBox;
@@ -143,9 +141,8 @@ export class RichTextRules {
                 return replaced;
             }),
 
-            // set the First-line indent node type for the selection's paragraph (assumes % was used to initiate an EnteringStyle mode)
-            new InputRule(/(%d|d)$/, (state, match, start, end) => {
-                if (!match[0].startsWith('%') && !this.EnteringStyle) return null;
+            // set the First-line indent node type for the selection's paragraph
+            new InputRule(/%d$/, (state, match, start, end) => {
                 const pos = state.doc.resolve(start);
                 for (let depth = pos.depth; depth >= 0; depth--) {
                     const node = pos.node(depth);
@@ -158,9 +155,8 @@ export class RichTextRules {
                 return null;
             }),
 
-            // set the Hanging indent node type for the current selection's paragraph (assumes % was used to initiate an EnteringStyle mode)
-            new InputRule(/(%h|h)$/, (state, match, start, end) => {
-                if (!match[0].startsWith('%') && !this.EnteringStyle) return null;
+            // set the Hanging indent node type for the current selection's paragraph
+            new InputRule(/%h$/, (state, match, start, end) => {
                 const pos = state.doc.resolve(start);
                 for (let depth = pos.depth; depth >= 0; depth--) {
                     const node = pos.node(depth);
@@ -173,9 +169,8 @@ export class RichTextRules {
                 return null;
             }),
 
-            // set the Quoted indent node type for the current selection's paragraph (assumes % was used to initiate an EnteringStyle mode)
-            new InputRule(/(%q|q)$/, (state, match, start, end) => {
-                if (!match[0].startsWith('%') && !this.EnteringStyle) return null;
+            // set the Quoted indent node type for the current selection's paragraph
+            new InputRule(/%q$/, (state, match, start, end) => {
                 const pos = state.doc.resolve(start);
                 if (state.selection instanceof NodeSelection && state.selection.node.type === schema.nodes.ordered_list) {
                     const { node } = state.selection;
@@ -410,22 +405,6 @@ export class RichTextRules {
             // # heading
             textblockTypeInputRule(/^(#{1,6})\s$/, schema.nodes.heading, match => ({ level: match[1].length })),
 
-            // set the Todo user-tag on the current selection (assumes % was used to initiate an EnteringStyle mode)
-            new InputRule(/[ti!x]$/, (state, match, start, end) => {
-                if (state.selection.to === state.selection.from || !this.EnteringStyle) return null;
-
-                const tag = match[0] === 't' ? 'todo' : match[0] === 'i' ? 'ignore' : match[0] === 'x' ? 'disagree' : match[0] === '!' ? 'important' : '??';
-                const node = state.doc.resolve(start).nodeAfter;
-
-                if (node?.marks.findIndex(m => m.type === schema.marks.user_tag) !== -1) return state.tr.removeMark(start, end, schema.marks.user_tag);
-                return node
-                    ? state.tr
-                          .removeMark(start, end, schema.marks.user_mark)
-                          .addMark(start, end, schema.marks.user_mark.create({ userid: ClientUtils.CurrentUserEmail(), modified: Math.floor(Date.now() / 1000) }))
-                          .addMark(start, end, schema.marks.user_tag.create({ userid: ClientUtils.CurrentUserEmail(), tag: tag, modified: Math.round(Date.now() / 1000 / 60) }))
-                    : state.tr;
-            }),
-
             new InputRule(/%\(/, (state, match, start, end) => {
                 const node = state.doc.resolve(start).nodeAfter;
                 const sm = state.storedMarks?.slice() || [];