From 5d45094640cca5b240ffaa6f6ab6d46243817916 Mon Sep 17 00:00:00 2001
From: IRBorisov <8611739+IRBorisov@users.noreply.github.com>
Date: Fri, 25 Aug 2023 00:33:16 +0300
Subject: [PATCH] UI fixes

---
 rsconcept/frontend/src/components/Footer.tsx  |  2 +-
 .../frontend/src/components/RSInput/index.tsx |  2 +-
 .../src/components/RSInput/textEditing.ts     | 42 +++++++++++++++++--
 .../pages/RSFormPage/EditorRSExpression.tsx   |  2 +-
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/rsconcept/frontend/src/components/Footer.tsx b/rsconcept/frontend/src/components/Footer.tsx
index 71f4ca2c..042286dc 100644
--- a/rsconcept/frontend/src/components/Footer.tsx
+++ b/rsconcept/frontend/src/components/Footer.tsx
@@ -16,7 +16,7 @@ function Footer() {
           <p className='mt-0.5 text-center'>© 2023 ЦИВТ КОНЦЕПТ</p>
         </div>
         <div className='flex flex-col underline'>
-          <a href={urls.exteor64} tabIndex={-1}>Экстеор</a>
+          <Link to='/manuals?topic=exteor' tabIndex={-1}>Экстеор</Link>
         </div>
         
       </div>
diff --git a/rsconcept/frontend/src/components/RSInput/index.tsx b/rsconcept/frontend/src/components/RSInput/index.tsx
index 2cc64f93..05290fb0 100644
--- a/rsconcept/frontend/src/components/RSInput/index.tsx
+++ b/rsconcept/frontend/src/components/RSInput/index.tsx
@@ -139,7 +139,7 @@ function RSInput({
   }, [thisRef]);
 
   return (
-    <div className={`w-full ${cursor} text-lg`}>
+    <div className={`w-full ${cursor}`}>
     {label && 
     <Label
       text={label}
diff --git a/rsconcept/frontend/src/components/RSInput/textEditing.ts b/rsconcept/frontend/src/components/RSInput/textEditing.ts
index acb0fe5d..5f2d69d7 100644
--- a/rsconcept/frontend/src/components/RSInput/textEditing.ts
+++ b/rsconcept/frontend/src/components/RSInput/textEditing.ts
@@ -70,9 +70,45 @@ export class TextWrapper {
   insertToken(tokenID: TokenID): boolean {
     const hasSelection = this.ref.view.state.selection.main.from !== this.ref.view.state.selection.main.to
     switch (tokenID) {
-    case TokenID.NT_DECLARATIVE_EXPR: this.envelopeWith('D{ξ∈X1 | P1[ξ]', '}'); return true;
-    case TokenID.NT_IMPERATIVE_EXPR: this.envelopeWith('I{(σ, γ) | σ:∈X1; γ:=F1[σ]; P1[σ, γ]', '}'); return true;
-    case TokenID.NT_RECURSIVE_FULL: this.envelopeWith('R{ ξ:=D1 | F1[ξ]≠∅ | ξ∪F1[ξ]', '}'); return true;
+    case TokenID.NT_DECLARATIVE_EXPR: {
+      if (hasSelection) {
+        this.envelopeWith('D{ξ∈X1 | ', '}');
+      } else {
+        this.envelopeWith('D{ξ∈X1 | P1[ξ]', '}');
+      }
+      this.ref.view.dispatch({
+        selection: {
+          anchor: this.ref.view.state.selection.main.from + 2,
+        }
+      });
+      return true;
+    }
+    case TokenID.NT_IMPERATIVE_EXPR: {
+      if (hasSelection) {
+        this.envelopeWith('I{(σ, γ) | σ:∈X1; γ:=F1[σ]; ', '}');
+      } else {
+        this.envelopeWith('I{(σ, γ) | σ:∈X1; γ:=F1[σ]; P1[σ, γ]', '}');
+      }
+      this.ref.view.dispatch({
+        selection: {
+          anchor: this.ref.view.state.selection.main.from + 2,
+        }
+      });
+      return true;
+    }
+    case TokenID.NT_RECURSIVE_FULL: {
+      if (hasSelection) {
+        this.envelopeWith('R{ξ:=D1 | F1[ξ]≠∅ | ', '}');
+      } else {
+        this.envelopeWith('R{ξ:=D1 | F1[ξ]≠∅ | ξ∪F1[ξ]', '}');
+      }
+      this.ref.view.dispatch({
+        selection: {
+          anchor: this.ref.view.state.selection.main.from + 2,
+        }
+      });
+      return true;
+    }
     case TokenID.BIGPR: this.envelopeWith('Pr1(', ')'); return true;
     case TokenID.SMALLPR: this.envelopeWith('pr1(', ')'); return true;
     case TokenID.FILTER: this.envelopeWith('Fi1[α](', ')'); return true;
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
index cb529126..9d7cb956 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression.tsx
@@ -196,7 +196,7 @@ function EditorRSExpression({
       </div>
       </div>
       <RSInput innerref={rsInput}
-        className='mt-2'
+        className='mt-2 text-lg'
         height='10.1rem'
         value={value}
         editable={!disabled}