From eee842a5d392ee0e9fdc1c29279fb4497784ef04 Mon Sep 17 00:00:00 2001 From: vitPinchuk Date: Wed, 2 Oct 2024 11:08:41 +0300 Subject: [PATCH 1/4] code editor update --- .../AutosizeCodeEditor/AutosizeCodeEditor.tsx | 8 +---- .../components/AutosizeCodeEditor/Toolbar.tsx | 32 ++++++++----------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx index 6f27b03..03f757c 100644 --- a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx +++ b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.tsx @@ -15,8 +15,6 @@ import { Toolbar } from './Toolbar'; type Props = React.ComponentProps & { minHeight?: number; maxHeight?: number; - modalTitle: string; - modalButtonTooltip: string; }; /** @@ -52,8 +50,6 @@ export const AutosizeCodeEditor: React.FC = ({ minHeight, maxHeight, height: staticHeight, - modalTitle, - modalButtonTooltip, onEditorDidMount, monacoOptions, showMiniMap, @@ -133,7 +129,6 @@ export const AutosizeCodeEditor: React.FC = ({ monacoEditor={monacoEditor} isShowMiniMap={isShowMiniMap} setIsShowMiniMap={setIsShowMiniMap} - modalButtonTooltip={modalButtonTooltip} currentMonacoOptions={currentMonacoOptions} setCurrentMonacoOptions={setCurrentMonacoOptions} /> @@ -151,7 +146,7 @@ export const AutosizeCodeEditor: React.FC = ({ /> setIsOpen(false)} className={styles.modal} @@ -167,7 +162,6 @@ export const AutosizeCodeEditor: React.FC = ({ isShowMiniMap={isShowMiniMap} monacoEditor={monacoEditorModal} setIsShowMiniMap={setIsShowMiniMap} - modalButtonTooltip={modalButtonTooltip} currentMonacoOptions={currentMonacoOptions} setCurrentMonacoOptions={setCurrentMonacoOptions} /> diff --git a/packages/components/src/components/AutosizeCodeEditor/Toolbar.tsx b/packages/components/src/components/AutosizeCodeEditor/Toolbar.tsx index b0e8030..bedf3ba 100644 --- a/packages/components/src/components/AutosizeCodeEditor/Toolbar.tsx +++ b/packages/components/src/components/AutosizeCodeEditor/Toolbar.tsx @@ -30,13 +30,6 @@ type Props = { */ setIsOpen: React.Dispatch>; - /** - * Modal Button tooltip - * - * @type {string} - */ - modalButtonTooltip: string; - /** * Value * @@ -86,7 +79,6 @@ type Props = { export const Toolbar: React.FC = ({ monacoEditor, setIsOpen, - modalButtonTooltip, editorValue, isModal = false, setCurrentMonacoOptions, @@ -123,7 +115,7 @@ export const Toolbar: React.FC = ({ leftItems={[ setIsOpen(isModal ? false : true)} @@ -205,16 +197,18 @@ export const Toolbar: React.FC = ({ }} {...TEST_IDS.codeEditor.wrapButton.apply()} /> - { - setIsShowMiniMap((prev) => !prev); - }} - {...TEST_IDS.codeEditor.miniMapButton.apply()} - /> + {editorValue && editorValue.length > 100 && ( + { + setIsShowMiniMap((prev) => !prev); + }} + {...TEST_IDS.codeEditor.miniMapButton.apply()} + /> + )} ); }; From 15df4d62ff584d037807a6d609c6a5525218d82b Mon Sep 17 00:00:00 2001 From: vitPinchuk Date: Wed, 2 Oct 2024 11:11:27 +0300 Subject: [PATCH 2/4] update version --- packages/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/package.json b/packages/components/package.json index efdfdff..5d01f3d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -88,5 +88,5 @@ "typecheck": "tsc --emitDeclarationOnly false --noEmit" }, "types": "dist/index.d.ts", - "version": "3.2.0" + "version": "3.3.0" } From 37cbe80bf2f0f3aee7c2d7c06031cbe073b62beb Mon Sep 17 00:00:00 2001 From: vitPinchuk Date: Wed, 2 Oct 2024 11:18:40 +0300 Subject: [PATCH 3/4] update CI tests --- .../AutosizeCodeEditor.test.tsx | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx index 1a8df3e..d62fc52 100644 --- a/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx +++ b/packages/components/src/components/AutosizeCodeEditor/AutosizeCodeEditor.test.tsx @@ -246,11 +246,15 @@ describe('AutosizeCodeEditor', () => { expect(onEditorDidMount).toHaveBeenCalledTimes(4); }); - it('Should render mini map button and show/hide map', async () => { + it('Should render mini map button and show/hide map if value more or equal 100 characters', async () => { const onChange = jest.fn(); const onEditorDidMount = jest.fn(); - render(getComponent({ onEditorDidMount, onChange })); + const valueIn1000Rows = Array.from(new Array(1000)) + .map((value, index) => index) + .join('\n'); + + render(getComponent({ value: valueIn1000Rows, onEditorDidMount, onChange })); /** * Check paste button @@ -289,6 +293,23 @@ describe('AutosizeCodeEditor', () => { expect(onEditorDidMount).toHaveBeenCalledTimes(4); }); + it('Should not render mini map button if value less than 100 characters', async () => { + const onChange = jest.fn(); + const onEditorDidMount = jest.fn(); + + /** + * 99 characters + */ + const value = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore'; + + render(getComponent({ value: value, onEditorDidMount, onChange })); + + /** + * Check paste button + */ + expect(selectors.miniMapButton(true)).not.toBeInTheDocument(); + }); + it('Should open/close modal on toolbar button', async () => { const onChange = jest.fn(); const onEditorDidMount = jest.fn(); From e7b6191a972be224a0f07541455863158ed1d997 Mon Sep 17 00:00:00 2001 From: Mikhail Volkov Date: Wed, 2 Oct 2024 20:50:35 -0400 Subject: [PATCH 4/4] Update CHANGELOG.md --- packages/components/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md index 09726ab..ddaff19 100644 --- a/packages/components/CHANGELOG.md +++ b/packages/components/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 3.3.0 (2024-10-02) + +### Features / Enhancements + +- Update Code Editor toolbar (#67) + ## 3.2.0 (2024-09-20) ### Features / Enhancements