mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Context menu for cards.
Summary: User was not able to delete cards. This patch introduces a context menu for cards, analogous to the one available for rows on a GridView. Changes: - Row numbers on a GridView have the same icon as on columns to make context menu more discoverable. - Context menu for rows and columns, when activated, didn't switch section in rare conditions (i.e. when the section had 2 or more columns selected, one of which had the same rowId as a column in the section that the user switched from). - Card list layout and a single card layout has the same context menu as in a GridView, available by pressing the context menu button. Test Plan: Browser tests Reviewers: dsagal, paulfitz Reviewed By: dsagal Differential Revision: https://phab.getgrist.com/D2870
This commit is contained in:
@@ -31,42 +31,6 @@ export function ColumnAddMenu(gridView: IView, viewSection: IViewSection) {
|
||||
}, `Show column ${col.label()}`))
|
||||
];
|
||||
}
|
||||
|
||||
interface IRowContextMenu {
|
||||
disableInsert: boolean;
|
||||
disableDelete: boolean;
|
||||
isViewSorted: boolean;
|
||||
}
|
||||
|
||||
export function RowContextMenu({ disableInsert, disableDelete, isViewSorted }: IRowContextMenu) {
|
||||
const result: Element[] = [];
|
||||
if (isViewSorted) {
|
||||
// When the view is sorted, any newly added records get shifts instantly at the top or
|
||||
// bottom. It could be very confusing for users who might expect the record to stay above or
|
||||
// below the active row. Thus in this case we show a single `insert row` command.
|
||||
result.push(
|
||||
menuItemCmd(allCommands.insertRecordAfter, 'Insert row',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
);
|
||||
} else {
|
||||
result.push(
|
||||
menuItemCmd(allCommands.insertRecordBefore, 'Insert row above',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
menuItemCmd(allCommands.insertRecordAfter, 'Insert row below',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
);
|
||||
}
|
||||
result.push(
|
||||
menuDivider(),
|
||||
menuItemCmd(allCommands.deleteRecords, 'Delete',
|
||||
dom.cls('disabled', disableDelete)),
|
||||
);
|
||||
result.push(
|
||||
menuDivider(),
|
||||
menuItemCmd(allCommands.copyLink, 'Copy anchor link'));
|
||||
return result;
|
||||
}
|
||||
|
||||
interface IMultiColumnContextMenu {
|
||||
// For multiple selection, true/false means the value applies to all columns, 'mixed' means it's
|
||||
// true for some columns, but not all.
|
||||
|
||||
34
app/client/ui/MenuToggle.ts
Normal file
34
app/client/ui/MenuToggle.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
import { dom, DomArg, IDisposableOwner, styled } from "grainjs";
|
||||
import { icon } from "app/client/ui2018/icons";
|
||||
import { colors } from "app/client/ui2018/cssVars";
|
||||
|
||||
/**
|
||||
* Creates a toggle button - little square button with a dropdown icon inside, used
|
||||
* by a context menu for a row inside a grid, a card inside a cardlist and column name.
|
||||
*/
|
||||
export function menuToggle(obs: IDisposableOwner, ...args: DomArg[]) {
|
||||
const contextMenu = cssMenuToggle(
|
||||
icon('Dropdown', dom.cls('menu_toggle_icon')),
|
||||
...args
|
||||
);
|
||||
return contextMenu;
|
||||
}
|
||||
|
||||
const cssMenuToggle = styled('div.menu_toggle', `
|
||||
background: white;
|
||||
cursor: pointer;
|
||||
--icon-color: ${colors.slate};
|
||||
border: 1px solid ${colors.slate};
|
||||
border-radius: 4px;
|
||||
&:hover {
|
||||
--icon-color: ${colors.darkGreen};
|
||||
border-color: ${colors.darkGreen};
|
||||
}
|
||||
&:active {
|
||||
--icon-color: ${colors.darkerGreen};
|
||||
border-color: ${colors.darkerGreen};
|
||||
}
|
||||
& > .menu_toggle_icon {
|
||||
display: block; /* don't create a line */
|
||||
}
|
||||
`);
|
||||
38
app/client/ui/RowContextMenu.ts
Normal file
38
app/client/ui/RowContextMenu.ts
Normal file
@@ -0,0 +1,38 @@
|
||||
import { allCommands } from 'app/client/components/commands';
|
||||
import { menuDivider, menuItemCmd } from 'app/client/ui2018/menus';
|
||||
import { dom } from 'grainjs';
|
||||
|
||||
interface IRowContextMenu {
|
||||
disableInsert: boolean;
|
||||
disableDelete: boolean;
|
||||
isViewSorted: boolean;
|
||||
}
|
||||
|
||||
export function RowContextMenu({ disableInsert, disableDelete, isViewSorted }: IRowContextMenu) {
|
||||
const result: Element[] = [];
|
||||
if (isViewSorted) {
|
||||
// When the view is sorted, any newly added records get shifts instantly at the top or
|
||||
// bottom. It could be very confusing for users who might expect the record to stay above or
|
||||
// below the active row. Thus in this case we show a single `insert row` command.
|
||||
result.push(
|
||||
menuItemCmd(allCommands.insertRecordAfter, 'Insert row',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
);
|
||||
} else {
|
||||
result.push(
|
||||
menuItemCmd(allCommands.insertRecordBefore, 'Insert row above',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
menuItemCmd(allCommands.insertRecordAfter, 'Insert row below',
|
||||
dom.cls('disabled', disableInsert)),
|
||||
);
|
||||
}
|
||||
result.push(
|
||||
menuDivider(),
|
||||
menuItemCmd(allCommands.deleteRecords, 'Delete',
|
||||
dom.cls('disabled', disableDelete)),
|
||||
);
|
||||
result.push(
|
||||
menuDivider(),
|
||||
menuItemCmd(allCommands.copyLink, 'Copy anchor link'));
|
||||
return result;
|
||||
}
|
||||
@@ -8,8 +8,30 @@ import {dom} from 'grainjs';
|
||||
* Returns a list of menu items for a view section.
|
||||
*/
|
||||
export function makeViewLayoutMenu(viewModel: ViewRec, viewSection: ViewSectionRec, isReadonly: boolean) {
|
||||
const gristDoc = viewSection.viewInstance.peek()!.gristDoc;
|
||||
const viewInstance = viewSection.viewInstance.peek()!;
|
||||
const gristDoc = viewInstance.gristDoc;
|
||||
|
||||
// get current row index from cursor
|
||||
const cursorRow = viewInstance.cursor.rowIndex.peek();
|
||||
// get row id from current data
|
||||
// rowId can be string - it is wrongly typed in cursor and in viewData
|
||||
const rowId = (cursorRow !== null ? viewInstance.viewData.getRowId(cursorRow) : null) as string|null|number;
|
||||
const isAddRow = rowId === 'new';
|
||||
|
||||
const contextMenu = [
|
||||
menuItemCmd(allCommands.deleteRecords,
|
||||
'Delete record',
|
||||
testId('section-delete-card'),
|
||||
dom.cls('disabled', isReadonly || isAddRow)),
|
||||
menuItemCmd(allCommands.copyLink,
|
||||
'Copy anchor link',
|
||||
testId('section-card-link'),
|
||||
),
|
||||
menuDivider(),
|
||||
];
|
||||
|
||||
return [
|
||||
dom.maybe((use) => ['single'].includes(use(viewSection.parentKey)), () => contextMenu),
|
||||
menuItemCmd(allCommands.printSection, 'Print widget', testId('print-section')),
|
||||
menuItemLink({ href: gristDoc.getCsvLink(), target: '_blank', download: ''},
|
||||
'Download as CSV', testId('download-section')),
|
||||
|
||||
Reference in New Issue
Block a user