diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts index 941e7ade87..e288b32148 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts @@ -518,7 +518,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: “IUPAC style” in Label display at stereogenic centers is selected by default. */ const deltaX = 0; - const deltaY = 50; + const deltaY = 100; await selectTopPanelButton(TopPanelButton.Settings, page); await page.getByText('Stereochemistry', { exact: true }).click(); await page.mouse.wheel(deltaX, deltaY); diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---IUPAC-style-selected-by-default-in-settings-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---IUPAC-style-selected-by-default-in-settings-1-chromium-linux.png index 36b7d731da..f8015bc5f7 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---IUPAC-style-selected-by-default-in-settings-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts-snapshots/Enhanced-Stereochemistry-Tool-Label-display-styles---IUPAC-style-selected-by-default-in-settings-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts index b6f70fc4b7..6adb7293d3 100644 --- a/ketcher-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts +++ b/ketcher-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts @@ -132,13 +132,13 @@ async function setAtomAndBondSettings(page: Page) { .locator('fieldset') .filter({ hasText: 'Aromatic Bonds as' }) .getByRole('textbox') - .nth(1) + .nth(2) .click(); await page .locator('fieldset') .filter({ hasText: 'Aromatic Bonds as' }) .getByRole('textbox') - .nth(1) + .nth(2) .fill('05'); await page.getByTestId('OK').click(); } diff --git "a/ketcher-autotests/tests/Settings/Atoms/atoms-settings.spec.ts-snapshots/Atom-Settings-\342\200\235Terminal-and-Hetero\342\200\235-is-set-for-default-for-\342\200\234Show-hydrogen-labels\342\200\235-1-chromium-linux.png" "b/ketcher-autotests/tests/Settings/Atoms/atoms-settings.spec.ts-snapshots/Atom-Settings-\342\200\235Terminal-and-Hetero\342\200\235-is-set-for-default-for-\342\200\234Show-hydrogen-labels\342\200\235-1-chromium-linux.png" index 30ed9ed489..8b97f75f0f 100644 Binary files "a/ketcher-autotests/tests/Settings/Atoms/atoms-settings.spec.ts-snapshots/Atom-Settings-\342\200\235Terminal-and-Hetero\342\200\235-is-set-for-default-for-\342\200\234Show-hydrogen-labels\342\200\235-1-chromium-linux.png" and "b/ketcher-autotests/tests/Settings/Atoms/atoms-settings.spec.ts-snapshots/Atom-Settings-\342\200\235Terminal-and-Hetero\342\200\235-is-set-for-default-for-\342\200\234Show-hydrogen-labels\342\200\235-1-chromium-linux.png" differ diff --git a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts index a90b5a697f..a5a87d2270 100644 --- a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts +++ b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts @@ -11,12 +11,7 @@ import { async function generalDefaultSettings(page: Page) { await selectTopPanelButton(TopPanelButton.Settings, page); - const deltaX = 0; - const deltaY = 150; - const anyX = 638; - const anyY = 524; - await page.mouse.move(anyX, anyY); - await page.mouse.wheel(deltaX, deltaY); + await page.getByTestId('General-accordion').click(); } async function resetSelectToolOff(page: Page) { diff --git a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-Ketcher-settings-panel-1-chromium-linux.png b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-Ketcher-settings-panel-1-chromium-linux.png index 5c9a0a443c..e6784b47d0 100644 Binary files a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-Ketcher-settings-panel-1-chromium-linux.png and b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-Ketcher-settings-panel-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-settings-menu-1-chromium-linux.png b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-settings-menu-1-chromium-linux.png index 0e9288afd6..cada40cb02 100644 Binary files a/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-settings-menu-1-chromium-linux.png and b/ketcher-autotests/tests/Settings/General/default-settings-verification.spec.ts-snapshots/Open-Ketcher-Verify-settings-menu-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts-snapshots/Undo-Redo-Actions-Undo-deletes-previously-placed-template-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts-snapshots/Undo-Redo-Actions-Undo-deletes-previously-placed-template-1-chromium-linux.png index 0e547d1fea..af904211ca 100644 Binary files a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts-snapshots/Undo-Redo-Actions-Undo-deletes-previously-placed-template-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts-snapshots/Undo-Redo-Actions-Undo-deletes-previously-placed-template-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Toolbar/toolbar.spec.ts-snapshots/Toolbar-palette-and-settings-Settings-UI-verification-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Toolbar/toolbar.spec.ts-snapshots/Toolbar-palette-and-settings-Settings-UI-verification-1-chromium-linux.png index 5c9a0a443c..e6784b47d0 100644 Binary files a/ketcher-autotests/tests/User-Interface/Toolbar/toolbar.spec.ts-snapshots/Toolbar-palette-and-settings-Settings-UI-verification-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Toolbar/toolbar.spec.ts-snapshots/Toolbar-palette-and-settings-Settings-UI-verification-1-chromium-linux.png differ diff --git a/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts b/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts index 2ac875a2d7..1d10429c7e 100644 --- a/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts +++ b/packages/ketcher-react/src/script/ui/data/schema/options-schema.ts @@ -35,6 +35,11 @@ export enum MeasurementUnits { Inch = 'inch', } +export enum ImageResolution { + high = '600', + low = '72', +} + const editor: { resetToSelect: ExtendedSchema; rotationStep: ExtendedSchema; @@ -85,6 +90,13 @@ const render: { bondThicknessUnit: ExtendedSchema; stereoBondWidth: ExtendedSchema; stereoBondWidthUnit: ExtendedSchema; + bondLength: ExtendedSchema; + bondLengthUnit: ExtendedSchema; + reactionComponentMarginSize: ExtendedSchema; + reactionComponentMarginSizeUnit: ExtendedSchema; + hashSpacing: ExtendedSchema; + hashSpacingUnit: ExtendedSchema; + imageResolution: ExtendedSchema; } = { showValenceWarnings: { title: 'Show valence warnings', @@ -275,6 +287,51 @@ const render: { enumNames: Object.values(MeasurementUnits), default: MeasurementUnits.Px, }, + bondLength: { + title: 'Bond length', + type: 'number', + default: 2.1, + minimum: 1, + maximum: 96, + }, + bondLengthUnit: { + title: 'Bond length unit', + enum: Object.values(MeasurementUnits), + enumNames: Object.values(MeasurementUnits), + default: MeasurementUnits.Px, + }, + reactionComponentMarginSize: { + title: 'Reaction component margin size', + type: 'number', + default: 2.3, + minimum: 1, + maximum: 96, + }, + reactionComponentMarginSizeUnit: { + title: 'Reaction component margin size unit', + enum: Object.values(MeasurementUnits), + enumNames: Object.values(MeasurementUnits), + default: MeasurementUnits.Px, + }, + hashSpacing: { + title: 'Hash spacing', + type: 'number', + default: 2.2, + minimum: 1, + maximum: 96, + }, + hashSpacingUnit: { + title: 'Hash spacing unit', + enum: Object.values(MeasurementUnits), + enumNames: Object.values(MeasurementUnits), + default: MeasurementUnits.Px, + }, + imageResolution: { + title: 'Image resolution', + enum: Object.values(ImageResolution), + enumNames: Object.keys(ImageResolution), + default: ImageResolution.low, + }, }; const server: { diff --git a/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Accordion/Accordion.tsx b/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Accordion/Accordion.tsx index cef3efa87c..f5f83d22cb 100644 --- a/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Accordion/Accordion.tsx +++ b/packages/ketcher-react/src/script/ui/views/modal/components/meta/Settings/Accordion/Accordion.tsx @@ -44,6 +44,7 @@ const Accordion = ({ tabs, className, changedGroups }): React.ReactElement => {