From 5507761c0fcaaff0d2e23211b42260f02a431af4 Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Sun, 9 Jun 2024 20:41:33 +0300 Subject: [PATCH] Improve help UI for small screens --- .vscode/settings.json | 1 + .../frontend/src/components/ui/Tooltip.tsx | 3 +- .../DlgConstituentaTemplate.tsx | 7 +- .../dialogs/DlgCreateCst/FormCreateCst.tsx | 8 ++- .../DlgEditReference/DlgEditReference.tsx | 18 +++--- .../DlgEditReference/SelectWordForm.tsx | 2 +- .../DlgEditReference/WordformButton.tsx | 2 +- .../DlgEditWordForms/DlgEditWordForms.tsx | 64 +++++++++++-------- .../frontend/src/dialogs/DlgRenameCst.tsx | 12 +++- rsconcept/frontend/src/dialogs/DlgShowAST.tsx | 4 +- .../src/pages/LibraryPage/SearchPanel.tsx | 9 ++- .../pages/ManualsPage/items/HelpAccess.tsx | 25 +++++++- .../ManualsPage/items/HelpFormulaTree.tsx | 6 +- .../pages/ManualsPage/items/HelpTermGraph.tsx | 16 ++--- .../OssPage/EditorOssCard/OssFormToolbar.tsx | 3 +- .../ConstituentaToolbar.tsx | 3 +- .../EditorConstituenta/ControlsOverlay.tsx | 4 +- .../EditorRSExpression/ExpressionToolbar.tsx | 2 +- .../EditorRSExpression/StatusBar.tsx | 2 + .../EditorRSFormCard/AccessToolbar.tsx | 3 +- .../EditorRSFormCard/RSFormToolbar.tsx | 3 +- .../EditorRSFormCard/VersionsToolbar.tsx | 3 +- .../EditorTermGraph/GraphToolbar.tsx | 9 ++- rsconcept/frontend/src/utils/constants.ts | 4 +- 24 files changed, 141 insertions(+), 72 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5774325c..2e751ffe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -155,6 +155,7 @@ "Булеан", "Бурбаки", "Версионирование", + "Владельцом", "Десинглетон", "доксинг", "интерпретируемости", diff --git a/rsconcept/frontend/src/components/ui/Tooltip.tsx b/rsconcept/frontend/src/components/ui/Tooltip.tsx index 627894d7..8f15e86d 100644 --- a/rsconcept/frontend/src/components/ui/Tooltip.tsx +++ b/rsconcept/frontend/src/components/ui/Tooltip.tsx @@ -33,7 +33,8 @@ function Tooltip({ delayHide={100} opacity={0.97} className={clsx( - 'overflow-auto sm:overflow-hidden overscroll-contain', + 'max-h-[calc(100svh-6rem)]', + 'overflow-y-auto overflow-x-hidden sm:overflow-hidden overscroll-contain', 'border shadow-md', 'text-balance', layer, diff --git a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx index 6b6ded19..95450716 100644 --- a/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx +++ b/rsconcept/frontend/src/dialogs/DlgConstituentaTemplate/DlgConstituentaTemplate.tsx @@ -14,6 +14,7 @@ import { HelpTopic } from '@/models/miscellaneous'; import { CstType, ICstCreateData, IRSForm } from '@/models/rsform'; import { generateAlias, validateNewAlias } from '@/models/rsformAPI'; import { inferTemplatedType, substituteTemplateArgs } from '@/models/rslangAPI'; +import { PARAMETER } from '@/utils/constants'; import FormCreateCst from '../DlgCreateCst/FormCreateCst'; import ArgumentsTab, { IArgumentsState } from './ArgumentsTab'; @@ -144,7 +145,11 @@ function DlgConstituentaTemplate({ hideWindow, schema, onCreate, insertAfter }: onSubmit={handleSubmit} > - + partialUpdate({ cst_type: data?.value ?? CstType.BASE })} /> - + - - + + - + diff --git a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx b/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx index 6f6b7ce5..1db8c129 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditReference/SelectWordForm.tsx @@ -22,7 +22,7 @@ function SelectWordForm({ selected, setSelected }: SelectWordFormProps) { ); return ( -
+
{DefaultWordForms.slice(0, 12).map((data, index) => ( onSelectGrams(grams)} className={clsx( - 'min-w-[6.15rem]', + 'min-w-[4.15rem] sm:min-w-[6.15rem]', 'p-1', 'border rounded-none', 'cursor-pointer', diff --git a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx index 28bd882d..e1557d99 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditWordForms/DlgEditWordForms.tsx @@ -16,6 +16,7 @@ import { Grammeme, ITextRequest, IWordForm, IWordFormPlain } from '@/models/lang import { parseGrammemes, wordFormEquals } from '@/models/languageAPI'; import { HelpTopic } from '@/models/miscellaneous'; import { IConstituenta, TermForm } from '@/models/rsform'; +import { PARAMETER } from '@/utils/constants'; import { prompts } from '@/utils/labels'; import { IGrammemeOption, SelectorGrammemes, SelectorGrammemesList } from '@/utils/selectors'; @@ -131,7 +132,11 @@ function DlgEditWordForms({ hideWindow, target, onSave }: DlgEditWordFormsProps) className='flex flex-col w-[40rem] px-6' > - +