From 3fd482656a4803e3b6451a6b93414b0fbe210936 Mon Sep 17 00:00:00 2001
From: vitPinchuk <vit.pinchuck@gmail.com>
Date: Mon, 25 Nov 2024 11:16:55 +0300
Subject: [PATCH 1/2] upd AutosizeCodeEditor

---
 package-lock.json                             |  2 +-
 packages/components/package.json              |  2 +-
 .../AutosizeCodeEditor.test.tsx               | 18 ++++++++++++++-
 .../AutosizeCodeEditor/AutosizeCodeEditor.tsx | 22 +++++++++++++++----
 packages/components/tsconfig.json             |  2 +-
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3216d62..4c5cdf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23062,7 +23062,7 @@
     },
     "packages/components": {
       "name": "@volkovlabs/components",
-      "version": "3.3.0",
+      "version": "3.5.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@emotion/css": "^11.11.2",
diff --git a/packages/components/package.json b/packages/components/package.json
index 30b0ebf..d7a63b8 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -89,5 +89,5 @@
     "typecheck": "tsc --emitDeclarationOnly false --noEmit"
   },
   "types": "dist/index.d.ts",
-  "version": "3.5.0"
+  "version": "3.5.1"
 }
diff --git a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
index d62fc52..af32fef 100644
--- a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
+++ b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
@@ -17,6 +17,21 @@ const InTestIds = {
   field: createSelector('data-testid field'),
 };
 
+const defaultModel = {
+  setEOL: jest.fn(),
+};
+
+const defalutMonaco = {
+  editor: {
+    EndOfLineSequence: {
+      '0': 'LF',
+      '1': 'CRLF',
+      LF: 0,
+      CRLF: 1,
+    },
+  },
+} as any;
+
 const editor = {
   getPosition: () => ({
     lineNumber: 12,
@@ -27,6 +42,7 @@ const editor = {
   revealLineInCenter: (value: any) => value,
   getSelection: () => null,
   executeEdits: (source: any, edits: any) => true,
+  getModel: () => defaultModel,
 };
 
 /**
@@ -46,7 +62,7 @@ jest.mock('@grafana/ui', () => ({
     /**
      * Call the onEditorDidMount callback with the editor instance
      */
-    onEditorDidMount(editor, '');
+    onEditorDidMount(editor, defalutMonaco);
 
     return (
       <textarea
diff --git a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx
index 03f757c..b851e79 100644
--- a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx
+++ b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx
@@ -79,6 +79,12 @@ export const AutosizeCodeEditor: React.FC<Props> = ({
    */
   const onEditorDidMountMain = useCallback(
     (editor: monacoType.editor.IStandaloneCodeEditor, monaco: typeof monacoType) => {
+      /**
+       * Set end of line to \n to all OS
+       */
+      const model = editor.getModel();
+      model?.setEOL(monaco.editor.EndOfLineSequence.LF);
+
       setMonacoEditor(editor);
       if (onEditorDidMount) {
         onEditorDidMount(editor, monaco);
@@ -92,6 +98,12 @@ export const AutosizeCodeEditor: React.FC<Props> = ({
    */
   const modalEditorDidMount = useCallback(
     (editor: monacoType.editor.IStandaloneCodeEditor, monaco: typeof monacoType) => {
+      /**
+       * Set end of line to \n to all OS
+       */
+      const model = editor.getModel();
+      model?.setEOL(monaco.editor.EndOfLineSequence.LF);
+
       setMonacoEditorModal(editor);
       if (monacoEditor) {
         const positionsParams: monacoType.Position | null = monacoEditor?.getPosition();
@@ -133,13 +145,14 @@ export const AutosizeCodeEditor: React.FC<Props> = ({
         setCurrentMonacoOptions={setCurrentMonacoOptions}
       />
       <CodeEditor
-        value={value}
+        value={value.replaceAll('\\n', '\n')}
         showMiniMap={isShowMiniMap}
         height={staticHeight ?? height}
         monacoOptions={currentMonacoOptions}
         onEditorDidMount={onEditorDidMountMain}
         onChange={(value) => {
-          onChange?.(value);
+          const currentValue = value.replaceAll('\n', '\\n');
+          onChange?.(currentValue);
           setHeight(getHeightByValue(value, minHeight, maxHeight));
         }}
         {...restProps}
@@ -166,13 +179,14 @@ export const AutosizeCodeEditor: React.FC<Props> = ({
             setCurrentMonacoOptions={setCurrentMonacoOptions}
           />
           <CodeEditor
-            value={value}
+            value={value.replaceAll('\\n', '\n')}
             showMiniMap={isShowMiniMap}
             containerStyles={styles.modalEditor}
             monacoOptions={currentMonacoOptions}
             onEditorDidMount={modalEditorDidMount}
             onChange={(value) => {
-              onChange?.(value);
+              const currentValue = value.replaceAll('\n', '\\n');
+              onChange?.(currentValue);
               setHeight(getHeightByValue(value, minHeight, maxHeight));
             }}
             {...restProps}
diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
index 2864187..9978614 100644
--- a/packages/components/tsconfig.json
+++ b/packages/components/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2021",
     "module": "esnext",
     "jsx": "react",
     "sourceMap": true,

From 09cdb92c26da8ccdbd2cae557e62fbcec72886d2 Mon Sep 17 00:00:00 2001
From: asimonok <sashasimonok@gmail.com>
Date: Tue, 26 Nov 2024 15:44:33 +0300
Subject: [PATCH 2/2] Fix typo

---
 .../components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
index af32fef..73e47b6 100644
--- a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
+++ b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx
@@ -21,7 +21,7 @@ const defaultModel = {
   setEOL: jest.fn(),
 };
 
-const defalutMonaco = {
+const defaultMonaco = {
   editor: {
     EndOfLineSequence: {
       '0': 'LF',
@@ -62,7 +62,7 @@ jest.mock('@grafana/ui', () => ({
     /**
      * Call the onEditorDidMount callback with the editor instance
      */
-    onEditorDidMount(editor, defalutMonaco);
+    onEditorDidMount(editor, defaultMonaco);
 
     return (
       <textarea