Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/component/1d/BrushTracker1D.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ export function BrushTracker1D({ children }: Required<PropsWithChildren>) {
payload: brushData,
});
break;
case options.databaseRangesSelection.id:
propagateEvent();
break;
case options.exclusionZones.id:
dispatch({
type: 'ADD_EXCLUSION_ZONE',
Expand Down Expand Up @@ -266,7 +269,7 @@ export function BrushTracker1D({ children }: Required<PropsWithChildren>) {
}
}

const tools = new Set<Tool>(['zoom', 'databaseRangesSelection']);
const tools = new Set<Tool>(['zoom']);
const enableDefaultBrush =
!tools.has(selectedTool) ||
(tools.has(selectedTool) && !brushData.shiftKey);
Expand Down
37 changes: 23 additions & 14 deletions src/component/panels/databasePanel/DatabasePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import {
initiateDatabase,
prepareData,
} from '../../../data/data1d/database.js';
import type { BrushTrackerData } from '../../EventsTrackers/BrushTracker.tsx';
import { useChartData } from '../../context/ChartContext.js';
import { useCore } from '../../context/CoreContext.js';
import { useDispatch } from '../../context/DispatchContext.js';
import { useMapKeyModifiers } from '../../context/KeyModifierContext.tsx';
import { usePreferences } from '../../context/PreferencesContext.js';
import { useToaster } from '../../context/ToasterContext.js';
import { EmptyText } from '../../elements/EmptyText.js';
Expand Down Expand Up @@ -192,30 +194,37 @@ function DatabasePanelInner({

void runner();
}, [idCode, keywords, search, toaster]);
const { getModifiersKey, primaryKeyIdentifier } = useMapKeyModifiers();

useEffect(() => {
function handle(event: { range: [number, number] }) {
if (selectedTool === options.databaseRangesSelection.id) {
setKeywords((prevState) => {
const oldKeywords = prevState.searchKeywords
? prevState.searchKeywords.split(' ')
: [];
const [from, to] = event.range;
const searchKeywords = [
...oldKeywords,
`delta:${format(from)}..${format(to)}`,
].join(' ');
return { ...prevState, searchKeywords };
});
function handle(event: BrushTrackerData & { range: [number, number] }) {
const keyModifiers = getModifiersKey(event);
if (
selectedTool !== options.databaseRangesSelection.id ||
keyModifiers !== primaryKeyIdentifier
) {
return;
}

setKeywords((prevState) => {
const oldKeywords = prevState.searchKeywords
? prevState.searchKeywords.split(' ')
: [];
const [from, to] = event.range;
const searchKeywords = [
...oldKeywords,
`delta:${format(from)}..${format(to)}`,
].join(' ');
return { ...prevState, searchKeywords };
});
}

Events.on('brushEnd', handle);

return () => {
Events.off('brushEnd', handle);
};
}, [format, selectedTool]);
}, [format, getModifiersKey, primaryKeyIdentifier, selectedTool]);

useEffect(() => {
if (!databaseInstance.current) return;
Expand Down
Loading