ConceptProd/ConceptPortal-public
1
0
Fork 0
mirror of https://github.com/IRBorisov/ConceptPortal.git synced 2025-06-26 13:00:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Still have problem with canvas preventing key events from firing

Browse Source
This commit is contained in:
IRBorisov 2023-11-07 18:59:00 +03:00
parent 5be2fc0200
commit 3f4f9b03dc
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta.tsx
View File

@ -161,7 +161,7 @@ function EditorConstituenta({
}
return (
<div className='flex max-w-[1500px] gap-2' tabIndex={0} onKeyDown={handleInput}>
<div className='flex max-w-[1500px] gap-2' tabIndex={-1} onKeyDown={handleInput}>
<form onSubmit={handleSubmit} className='min-w-[50rem] max-w-[50rem] px-4 py-1'>
<div className='relative w-full'>
<div className='absolute top-0 right-0 flex items-start justify-between w-full'>

2
rsconcept/frontend/src/pages/RSFormPage/EditorItems.tsx
View File

@ -293,7 +293,7 @@ function EditorItems({ onOpenEdit, onCreateCst, onDeleteCst, onTemplates }: Edit
<div
className='w-full outline-none'
style={{minHeight: mainHeight}}
tabIndex={0}
tabIndex={-1}
onKeyDown={handleTableKey}
>
<div className='sticky top-0 flex justify-start w-full gap-1 px-2 py-1 border-b items-center h-[2.2rem] select-none clr-app'>

2
rsconcept/frontend/src/pages/RSFormPage/EditorRSForm.tsx
View File

@ -94,7 +94,7 @@ function EditorRSForm({ onDestroy, onClaim, onShare, isModified, setIsModified,
}
return (
<div tabIndex={0} onKeyDown={handleInput}>
<div tabIndex={-1} onKeyDown={handleInput}>
<div className='relative flex items-start justify-center w-full'>
<div className='absolute flex mt-1'>
<MiniButton

16
rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph.tsx
View File

@ -245,7 +245,6 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
if (event.key === 'Delete' && allSelected.length > 0) {
event.preventDefault();
handleDeleteCst();
return;
}
}
@ -446,10 +445,11 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
{dismissed.map(cstID => {
const cst = schema!.items.find(cst => cst.id === cstID)!;
const adjustedColoring = coloringScheme === 'none' ? 'status': coloringScheme;
return (<>
const id = `${prefixes.cst_hidden_list}${cst.alias}`
return (<div key={`wrap-${id}`}>
<div
key={`${cst.alias}`}
id={`${prefixes.cst_list}${cst.alias}`}
key={id}
id={id}
className='w-fit min-w-[3rem] rounded-md text-center cursor-pointer select-none'
style={{
backgroundColor: getCstNodeColor(cst, adjustedColoring, colors),
@ -460,18 +460,18 @@ function EditorTermGraph({ onOpenEdit, onCreateCst, onDeleteCst }: EditorTermGra
>
{cst.alias}
</div>
<ConstituentaTooltip
<ConstituentaTooltip
data={cst}
anchor={`#${prefixes.cst_list}${cst.alias}`}
anchor={`#${id}`}
/>
</>);
</div>);
})}
</div>
</div>}
</div>
</div>
<div className='w-full h-full overflow-auto outline-none' tabIndex={0} onKeyDown={handleKeyDown}>
<div className='w-full h-full overflow-auto outline-none' tabIndex={-1} onKeyDown={handleKeyDown}>
<div
className='relative'
style={{width: canvasWidth, height: canvasHeight}}

7
rsconcept/frontend/src/pages/RSFormPage/RSTabs.tsx
View File

@ -384,7 +384,6 @@ function RSTabs() {
selectedIndex={activeTab}
onSelect={onSelectTab}
defaultFocus
forceRenderTabPanel
selectedTabClassName='clr-selected'
className='flex flex-col items-center w-full'
>
@ -420,7 +419,7 @@ function RSTabs() {
</TabList>
<div className='overflow-y-auto' style={{ maxHeight: panelHeight}}>
<TabPanel style={{ display: activeTab === RSTabID.CARD ? '': 'none' }}>
<TabPanel forceRender style={{ display: activeTab === RSTabID.CARD ? '': 'none' }}>
<EditorRSForm
isModified={isModified}
setIsModified={setIsModified}
@ -431,7 +430,7 @@ function RSTabs() {
/>
</TabPanel>
<TabPanel style={{ display: activeTab === RSTabID.CST_LIST ? '': 'none' }}>
<TabPanel forceRender style={{ display: activeTab === RSTabID.CST_LIST ? '': 'none' }}>
<EditorItems
onOpenEdit={onOpenCst}
onCreateCst={promptCreateCst}
@ -440,7 +439,7 @@ function RSTabs() {
/>
</TabPanel>
<TabPanel style={{ display: activeTab === RSTabID.CST_EDIT ? '': 'none' }}>
<TabPanel forceRender style={{ display: activeTab === RSTabID.CST_EDIT ? '': 'none' }}>
<EditorConstituenta
isModified={isModified}
setIsModified={setIsModified}

1
rsconcept/frontend/src/utils/constants.ts
View File

@ -34,6 +34,7 @@ export const globalIDs = {
export const prefixes = {
cst_list: 'cst-list-',
cst_hidden_list: 'cst-hidden-list-',
cst_modal_list: 'cst-modal-list-',
cst_template_ist: 'cst-template-list-',
cst_wordform_list: 'cst-wordform-list-',