mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-19 16:52:29 +00:00
2f900f68f8
Summary: Includes overhauled choice configuration UI for choice and choice list columns based on the TokenField library. Features include rich copy and paste support, keyboard shortcuts for token manipulation, and drag-and-drop support for arrangement. Configured choice colors are visible throughout the application, such as in the autocomplete window for both choice and choice list cells, and in table cells directly. Choice cells in particular are now styled closer to choice list cells, and render their contents as colored tokens. Choice cells now also use the improved autocomplete component that choice lists use, with some room for future improvement (e.g. allowing new choice items to be added inline like in choice list's autocomplete). Also includes a minor fix for choice list cells where right align was not working. Test Plan: Browser tests updated. Reviewers: jarek, dsagal Reviewed By: jarek, dsagal Subscribers: jarek Differential Revision: https://phab.getgrist.com/D2890
84 lines
2.5 KiB
TypeScript
84 lines
2.5 KiB
TypeScript
import {DataRowModel} from 'app/client/models/DataRowModel';
|
|
import {colors, testId} from 'app/client/ui2018/cssVars';
|
|
import {
|
|
ChoiceOptionsByName,
|
|
ChoiceTextBox,
|
|
getFillColor,
|
|
getTextColor
|
|
} from 'app/client/widgets/ChoiceTextBox';
|
|
import {CellValue} from 'app/common/DocActions';
|
|
import {decodeObject} from 'app/plugin/objtypes';
|
|
import {Computed, dom, styled} from 'grainjs';
|
|
|
|
/**
|
|
* ChoiceListCell - A cell that renders a list of choice tokens.
|
|
*/
|
|
export class ChoiceListCell extends ChoiceTextBox {
|
|
private _choiceSet = Computed.create(this, this.getChoiceValues(), (use, values) => new Set(values));
|
|
|
|
public buildDom(row: DataRowModel) {
|
|
const value = row.cells[this.field.colId.peek()];
|
|
|
|
return cssChoiceList(
|
|
dom.cls('field_clip'),
|
|
cssChoiceList.cls('-wrap', this.wrapping),
|
|
dom.style('justify-content', use => use(this.alignment) === 'right' ? 'flex-end' : use(this.alignment)),
|
|
dom.domComputed((use) => {
|
|
return use(row._isAddRow) ? null :
|
|
[
|
|
use(value), use(this._choiceSet),
|
|
use(this.getChoiceOptions())
|
|
] as [CellValue, Set<string>, ChoiceOptionsByName];
|
|
}, (input) => {
|
|
if (!input) { return null; }
|
|
const [rawValue, choiceSet, choiceOptionsByName] = input;
|
|
const val = decodeObject(rawValue);
|
|
if (!val) { return null; }
|
|
// Handle any unexpected values we might get (non-array, or array with non-strings).
|
|
const tokens: unknown[] = Array.isArray(val) ? val : [val];
|
|
return tokens.map(token =>
|
|
cssToken(
|
|
String(token),
|
|
cssInvalidToken.cls('-invalid', !choiceSet.has(token as string)),
|
|
dom.style('background-color', getFillColor(choiceOptionsByName.get(String(token)))),
|
|
dom.style('color', getTextColor(choiceOptionsByName.get(String(token)))),
|
|
testId('choice-list-cell-token')
|
|
),
|
|
);
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
const cssChoiceList = styled('div', `
|
|
display: flex;
|
|
align-items: start;
|
|
padding: 0 3px;
|
|
|
|
position: relative;
|
|
height: min-content;
|
|
min-height: 22px;
|
|
|
|
&-wrap {
|
|
flex-wrap: wrap;
|
|
}
|
|
`);
|
|
|
|
const cssToken = styled('div', `
|
|
flex: 0 1 auto;
|
|
min-width: 0px;
|
|
overflow: hidden;
|
|
border-radius: 3px;
|
|
padding: 1px 4px;
|
|
margin: 2px;
|
|
line-height: 16px;
|
|
`);
|
|
|
|
export const cssInvalidToken = styled('div', `
|
|
&-invalid {
|
|
background-color: white !important;
|
|
box-shadow: inset 0 0 0 1px var(--grist-color-error);
|
|
color: ${colors.slate};
|
|
}
|
|
`);
|