mirror of
https://github.com/gristlabs/grist-core.git
synced 2024-10-27 20:44:07 +00:00
3c72639e25
Summary: Adding sort options for columns. - Sort menu has a new option "More sort options" that opens up Sort left menu - Each sort entry has an additional menu with 3 options -- Order by choice index (for the Choice column, orders by choice position) -- Empty last (puts empty values last in ascending order, first in descending order) -- Natural sort (for Text column, compares strings with numbers as numbers) Updated also CSV/Excel export and api sorting. Most of the changes in this diff is a sort expression refactoring. Pulling out all the methods that works on sortExpression array into a single namespace. Test Plan: Browser tests Reviewers: alexmojaki Reviewed By: alexmojaki Subscribers: dsagal, alexmojaki Differential Revision: https://phab.getgrist.com/D3077
196 lines
5.1 KiB
TypeScript
196 lines
5.1 KiB
TypeScript
/**
|
|
* UI 2018 Checkboxes
|
|
*
|
|
* Includes:
|
|
* - squareCheckbox
|
|
* - circleCheckbox
|
|
* - labeledSquareCheckbox
|
|
* - labeledCircleCheckbox
|
|
*
|
|
* Checkboxes support passing in DomElementArgs, which can be used to register click handlers, set
|
|
* the disabled property, and other HTML <input> element behaviors.
|
|
*
|
|
* Examples:
|
|
* squareCheckbox(observable(true)),
|
|
* labeledSquareCheckbox(observable(false), 'Include other values', dom.prop('disabled', true)),
|
|
*/
|
|
|
|
import { colors } from 'app/client/ui2018/cssVars';
|
|
import { Computed, dom, DomArg, styled } from 'grainjs';
|
|
import { Observable } from 'grainjs';
|
|
|
|
export const cssLabel = styled('label', `
|
|
position: relative;
|
|
display: inline-flex;
|
|
min-width: 0px;
|
|
margin-bottom: 0px;
|
|
|
|
outline: none;
|
|
user-select: none;
|
|
|
|
--color: ${colors.darkGrey};
|
|
&:hover {
|
|
--color: ${colors.hover};
|
|
}
|
|
`);
|
|
|
|
// TODO: the !important markings are to trump bootstrap, and should be removed when it's gone.
|
|
export const cssCheckboxSquare = styled('input', `
|
|
-webkit-appearance: none;
|
|
-moz-appearance: none;
|
|
margin: 0 !important;
|
|
padding: 0;
|
|
|
|
flex-shrink: 0;
|
|
|
|
display: inline-block;
|
|
width: 16px;
|
|
height: 16px;
|
|
outline: none !important;
|
|
|
|
--radius: 3px;
|
|
|
|
&:checked:enabled, &:indeterminate:enabled {
|
|
--color: ${colors.lightGreen};
|
|
}
|
|
|
|
&:disabled {
|
|
--color: ${colors.darkGrey};
|
|
cursor: not-allowed;
|
|
}
|
|
|
|
.${cssLabel.className}:hover > &:checked:enabled,
|
|
.${cssLabel.className}:hover > &:indeterminate:enabled, {
|
|
--color: ${colors.darkGreen};
|
|
}
|
|
|
|
|
|
&::before, &::after {
|
|
content: '';
|
|
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
|
|
height: 16px;
|
|
width: 16px;
|
|
|
|
box-sizing: border-box;
|
|
border: 1px solid var(--color);
|
|
border-radius: var(--radius);
|
|
}
|
|
|
|
&:checked::before, &:disabled::before, &:indeterminate::before {
|
|
background-color: var(--color);
|
|
}
|
|
|
|
&:checked::after, &:indeterminate::after {
|
|
content: '';
|
|
position: absolute;
|
|
height: 16px;
|
|
width: 16px;
|
|
-webkit-mask-image: var(--icon-Tick);
|
|
-webkit-mask-size: contain;
|
|
-webkit-mask-position: center;
|
|
-webkit-mask-repeat: no-repeat;
|
|
background-color: ${colors.light};
|
|
}
|
|
|
|
&:not(:checked):indeterminate::after {
|
|
-webkit-mask-image: var(--icon-Minus);
|
|
}
|
|
|
|
&:not(:disabled)::after {
|
|
background-color: ${colors.light};
|
|
}
|
|
`);
|
|
|
|
export const cssCheckboxCircle = styled(cssCheckboxSquare, `
|
|
--radius: 100%;
|
|
`);
|
|
|
|
export const cssLabelText = styled('span', `
|
|
margin-left: 8px;
|
|
color: ${colors.dark};
|
|
font-weight: initial; /* negate bootstrap */
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
`);
|
|
|
|
type CheckboxArg = DomArg<HTMLInputElement>;
|
|
|
|
function checkbox(
|
|
obs: Observable<boolean>, cssCheckbox: typeof cssCheckboxSquare,
|
|
label: DomArg, right: boolean, ...domArgs: CheckboxArg[]
|
|
) {
|
|
const field = cssCheckbox(
|
|
{ type: 'checkbox' },
|
|
dom.prop('checked', obs),
|
|
dom.on('change', (ev, el) => obs.set(el.checked)),
|
|
...domArgs
|
|
);
|
|
const text = label ? cssLabelText(label) : null;
|
|
if (right) {
|
|
return cssReversedLabel([text, cssInlineRelative(field)]);
|
|
}
|
|
return cssLabel(field, text);
|
|
}
|
|
|
|
export function squareCheckbox(obs: Observable<boolean>, ...domArgs: CheckboxArg[]) {
|
|
return checkbox(obs, cssCheckboxSquare, '', false, ...domArgs);
|
|
}
|
|
|
|
export function circleCheckbox(obs: Observable<boolean>, ...domArgs: CheckboxArg[]) {
|
|
return checkbox(obs, cssCheckboxCircle, '', false, ...domArgs);
|
|
}
|
|
|
|
export function labeledSquareCheckbox(obs: Observable<boolean>, label: DomArg, ...domArgs: CheckboxArg[]) {
|
|
return checkbox(obs, cssCheckboxSquare, label, false, ...domArgs);
|
|
}
|
|
|
|
export function labeledLeftSquareCheckbox(obs: Observable<boolean>, label: DomArg, ...domArgs: CheckboxArg[]) {
|
|
return checkbox(obs, cssCheckboxSquare, label, true, ...domArgs);
|
|
}
|
|
|
|
export function labeledCircleCheckbox(obs: Observable<boolean>, label: DomArg, ...domArgs: CheckboxArg[]) {
|
|
return checkbox(obs, cssCheckboxCircle, label, false, ...domArgs);
|
|
}
|
|
|
|
export const Indeterminate = 'indeterminate';
|
|
export type TriState = boolean|'indeterminate';
|
|
|
|
function triStateCheckbox(
|
|
obs: Observable<TriState>, cssCheckbox: typeof cssCheckboxSquare, label: string = '', ...domArgs: CheckboxArg[]
|
|
) {
|
|
const checkboxObs = Computed.create(null, obs, (_use, state) => state === true)
|
|
.onWrite((checked) => obs.set(checked));
|
|
return checkbox(
|
|
checkboxObs, cssCheckbox, label, false,
|
|
dom.prop('indeterminate', (use) => use(obs) === 'indeterminate'),
|
|
dom.autoDispose(checkboxObs),
|
|
...domArgs
|
|
);
|
|
}
|
|
|
|
export function triStateSquareCheckbox(obs: Observable<TriState>, ...domArgs: CheckboxArg[]) {
|
|
return triStateCheckbox(obs, cssCheckboxSquare, '', ...domArgs);
|
|
}
|
|
|
|
export function labeledTriStateSquareCheckbox(obs: Observable<TriState>, label: string, ...domArgs: CheckboxArg[]) {
|
|
return triStateCheckbox(obs, cssCheckboxSquare, label, ...domArgs);
|
|
}
|
|
|
|
const cssInlineRelative = styled('div', `
|
|
display: inline-block;
|
|
position: relative;
|
|
height: 16px;
|
|
`);
|
|
|
|
const cssReversedLabel = styled(cssLabel, `
|
|
justify-content: space-between;
|
|
gap: 8px;
|
|
& .${cssLabelText.className} {
|
|
margin: 0px;
|
|
}
|
|
`);
|