From ff744b5367cc3d1244ba72884c211b9060aede45 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 19 Mar 2025 12:44:21 +0300
Subject: [PATCH] M: Revert to default selection behavior and fix minor issues

---
 .vscode/settings.json                         |  1 +
 .../src/app/navigation/navigation.tsx         | 10 ++--
 .../components/refs-input/refs-input.tsx      | 58 +++++++++----------
 .../rsform/components/rs-input/rs-input.tsx   |  3 +-
 .../dlg-create-cst/form-create-cst.tsx        |  2 +-
 .../editor-constituenta/form-constituenta.tsx |  4 +-
 rsconcept/frontend/src/styling/colors.ts      |  4 +-
 rsconcept/frontend/src/styling/overrides.css  | 11 ++++
 rsconcept/frontend/src/styling/setup.css      |  9 +--
 9 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0a711b90..da3aaabd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -151,6 +151,7 @@
     "rsconcept",
     "rsedit",
     "rseditor",
+    "rsexpression",
     "rsform",
     "rsforms",
     "rsgraph",
diff --git a/rsconcept/frontend/src/app/navigation/navigation.tsx b/rsconcept/frontend/src/app/navigation/navigation.tsx
index 036841e4..cd29a745 100644
--- a/rsconcept/frontend/src/app/navigation/navigation.tsx
+++ b/rsconcept/frontend/src/app/navigation/navigation.tsx
@@ -13,18 +13,18 @@ import { ToggleNavigation } from './toggle-navigation';
 import { UserMenu } from './user-menu';
 
 export function Navigation() {
-  const router = useConceptNavigation();
+  const { push } = useConceptNavigation();
   const size = useWindowSize();
   const noNavigationAnimation = useAppLayoutStore(state => state.noNavigationAnimation);
 
   const navigateHome = (event: React.MouseEvent<Element>) =>
-    router.push({ path: urls.home, newTab: event.ctrlKey || event.metaKey });
+    push({ path: urls.home, newTab: event.ctrlKey || event.metaKey });
   const navigateLibrary = (event: React.MouseEvent<Element>) =>
-    router.push({ path: urls.library, newTab: event.ctrlKey || event.metaKey });
+    push({ path: urls.library, newTab: event.ctrlKey || event.metaKey });
   const navigateHelp = (event: React.MouseEvent<Element>) =>
-    router.push({ path: urls.manuals, newTab: event.ctrlKey || event.metaKey });
+    push({ path: urls.manuals, newTab: event.ctrlKey || event.metaKey });
   const navigateCreateNew = (event: React.MouseEvent<Element>) =>
-    router.push({ path: urls.create_schema, newTab: event.ctrlKey || event.metaKey });
+    push({ path: urls.create_schema, newTab: event.ctrlKey || event.metaKey });
 
   return (
     <nav className='z-navigation sticky top-0 left-0 right-0 select-none bg-prim-100'>
diff --git a/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx b/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
index 6fe3bd4b..3b5d67f6 100644
--- a/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/refs-input/refs-input.tsx
@@ -29,34 +29,6 @@ import { refsNavigation } from './click-navigation';
 import { NaturalLanguage, ReferenceTokens } from './parse';
 import { refsHoverTooltip } from './tooltip';
 
-const editorSetup: BasicSetupOptions = {
-  highlightSpecialChars: false,
-  history: true,
-  drawSelection: true,
-  syntaxHighlighting: false,
-  defaultKeymap: true,
-  historyKeymap: true,
-
-  lineNumbers: false,
-  highlightActiveLineGutter: false,
-  foldGutter: false,
-  dropCursor: true,
-  allowMultipleSelections: false,
-  indentOnInput: false,
-  bracketMatching: false,
-  closeBrackets: false,
-  autocompletion: false,
-  rectangularSelection: false,
-  crosshairCursor: false,
-  highlightActiveLine: false,
-  highlightSelectionMatches: false,
-  closeBracketsKeymap: false,
-  searchKeymap: false,
-  foldKeymap: false,
-  completionKeymap: false,
-  lintKeymap: false
-};
-
 interface RefsInputInputProps
   extends Pick<
     ReactCodeMirrorProps,
@@ -117,7 +89,6 @@ export const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
         fontFamily: 'inherit',
         background: !disabled ? APP_COLORS.bgInput : APP_COLORS.bgDefault,
         foreground: APP_COLORS.fgDefault,
-        selection: APP_COLORS.bgHover,
         caret: APP_COLORS.fgDefault
       },
       styles: [
@@ -225,3 +196,32 @@ export const RefsInput = forwardRef<ReactCodeMirrorRef, RefsInputInputProps>(
     );
   }
 );
+
+// ======= Internal ==========
+const editorSetup: BasicSetupOptions = {
+  highlightSpecialChars: false,
+  history: true,
+  drawSelection: false,
+  syntaxHighlighting: false,
+  defaultKeymap: true,
+  historyKeymap: true,
+
+  lineNumbers: false,
+  highlightActiveLineGutter: false,
+  foldGutter: false,
+  dropCursor: true,
+  allowMultipleSelections: false,
+  indentOnInput: false,
+  bracketMatching: false,
+  closeBrackets: false,
+  autocompletion: false,
+  rectangularSelection: false,
+  crosshairCursor: false,
+  highlightActiveLine: false,
+  highlightSelectionMatches: false,
+  closeBracketsKeymap: false,
+  searchKeymap: false,
+  foldKeymap: false,
+  completionKeymap: false,
+  lintKeymap: false
+};
diff --git a/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx b/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
index 4f8d7752..cc57b112 100644
--- a/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/rs-input/rs-input.tsx
@@ -81,7 +81,6 @@ export const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
         fontFamily: 'inherit',
         background: !disabled ? APP_COLORS.bgInput : APP_COLORS.bgDefault,
         foreground: APP_COLORS.fgDefault,
-        selection: APP_COLORS.bgHover,
         caret: APP_COLORS.fgDefault
       },
       styles: [
@@ -184,7 +183,7 @@ export const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
 const editorSetup: BasicSetupOptions = {
   highlightSpecialChars: false,
   history: true,
-  drawSelection: true,
+  drawSelection: false,
   syntaxHighlighting: false,
   defaultKeymap: true,
   historyKeymap: true,
diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
index 1d0f1081..42375eab 100644
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-create-cst/form-create-cst.tsx
@@ -113,7 +113,7 @@ export function FormCreateCst({ schema }: FormCreateCstProps) {
           id='dlg_cst_show_comment'
           tabIndex={-1}
           type='button'
-          className='self-start cc-label text-sec-600 hover:underline'
+          className='self-start cc-label text-sec-600 hover:underline select-none'
           onClick={() => setForceComment(true)}
         >
           Добавить комментарий
diff --git a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
index bbdf9b6a..22cf3142 100644
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-constituenta/form-constituenta.tsx
@@ -146,7 +146,7 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
       ) : null}
 
       <div className='absolute z-pop top-0 left-[calc(7ch+4px+3rem)] flex select-none'>
-        <div className='pt-1 text-sm font-medium whitespace-nowrap select-text cursor-default'>
+        <div className='pt-1 text-sm font-medium min-w-16 whitespace-nowrap select-text cursor-default'>
           <span>Имя </span>
           <span className='ml-1'>{activeCst?.alias ?? ''}</span>
         </div>
@@ -264,7 +264,7 @@ export function FormConstituenta({ disabled, id, toggleReset, schema, activeCst,
         <button
           type='button'
           tabIndex={-1}
-          className='self-start cc-label text-sec-600 hover:underline'
+          className='self-start cc-label text-sec-600 hover:underline select-none'
           onClick={() => setForceComment(true)}
         >
           Добавить комментарий
diff --git a/rsconcept/frontend/src/styling/colors.ts b/rsconcept/frontend/src/styling/colors.ts
index d04924e1..081cb278 100644
--- a/rsconcept/frontend/src/styling/colors.ts
+++ b/rsconcept/frontend/src/styling/colors.ts
@@ -41,9 +41,7 @@ export const APP_COLORS = {
   fgOrange:           'var(--acc-fg-orange)'
 }
 
-/**
- * Represents Select component theme.
- */
+/** Represents Select component theme. */
 export const SELECT_THEME = {
   primary: APP_COLORS.bgPrimary,
   primary75: APP_COLORS.bgSelected,
diff --git a/rsconcept/frontend/src/styling/overrides.css b/rsconcept/frontend/src/styling/overrides.css
index 03054030..d0e89663 100644
--- a/rsconcept/frontend/src/styling/overrides.css
+++ b/rsconcept/frontend/src/styling/overrides.css
@@ -19,6 +19,15 @@
   z-index: 100;
 }
 
+.cm-selectionBackground {
+  background: highlight !important;
+}
+
+.cm-content ::selection {
+  background: highlight !important;
+  color: highlighttext !important;
+}
+
 .cm-editor {
   resize: vertical;
   overflow-y: auto;
@@ -43,6 +52,8 @@
 .cm-editor .cm-placeholder {
   font-family: var(--font-main);
   color: var(--clr-prim-600);
+  user-select: none;
+  -webkit-user-select: none;
 }
 
 .react-flow__handle {
diff --git a/rsconcept/frontend/src/styling/setup.css b/rsconcept/frontend/src/styling/setup.css
index 6878d3cb..95262111 100644
--- a/rsconcept/frontend/src/styling/setup.css
+++ b/rsconcept/frontend/src/styling/setup.css
@@ -94,16 +94,9 @@
     outline-color: transparent;
   }
 
-  ::selection {
-    background: var(--clr-sec-100);
-  }
-
-  tr:hover ::selection {
-    background: var(--clr-warn-100);
-  }
-
   ::placeholder {
     color: var(--clr-prim-600);
+    user-select: none;
   }
 
   /* Wrapping headers */