Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cell placeholders #1950

Merged
merged 24 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "Add placeholders to table columns",
"packageName": "@ni/nimble-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Avoid mixing `undefined` and `null` as values for the same field. When grouping this will lead to two groups (one for `null` values and one for `undefined` values) that both have the text `"No value"`.
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,25 @@ TableColumnAnchorColumnConfig
@observable
public hasOverflow = false;

/** @internal */
@observable
public isPlaceholder = false;

/** @internal */
public anchor?: Anchor;

@volatile
public get text(): string {
const displayedText = this.cellRecord?.label ?? this.cellRecord?.href;
if (
(displayedText === undefined || displayedText === null)
&& this.columnConfig?.placeholder
mollykreis marked this conversation as resolved.
Show resolved Hide resolved
) {
this.isPlaceholder = true;
return this.columnConfig.placeholder;
}

this.isPlaceholder = false;
if (typeof this.cellRecord?.label === 'string') {
return this.cellRecord.label;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { css } from '@microsoft/fast-element';
import { bodyFont, bodyFontColor } from '../../../theme-provider/design-tokens';
import {
bodyFont,
bodyFontColor,
placeholderFont,
placeholderFontColor
} from '../../../theme-provider/design-tokens';

export const styles = css`
:host {
Expand All @@ -22,4 +27,9 @@ export const styles = css`
overflow: hidden;
text-overflow: ellipsis;
}

:host(.placeholder) span {
font: ${placeholderFont};
color: ${placeholderFontColor};
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const template = html<TableColumnAnchorCellView>`
}
return true;
}}"
class="${x => (x.isPlaceholder ? 'placeholder' : '')}"
>
${when(x => typeof x.cellRecord?.href === 'string', html<TableColumnAnchorCellView>`
<${anchorTag}
Expand Down
15 changes: 13 additions & 2 deletions packages/nimble-components/src/table-column/anchor/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { template } from '../base/template';
import { TableColumnSortOperation } from '../base/types';
import { mixinFractionalWidthColumnAPI } from '../mixins/fractional-width-column';
import { mixinGroupableColumnAPI } from '../mixins/groupable-column';
import { mixinColumnWithPlaceholderAPI } from '../mixins/placeholder';
import type { TableStringField } from '../../table/types';
import { tableColumnAnchorCellViewTag } from './cell-view';
import { tableColumnTextGroupHeaderViewTag } from '../text/group-header-view';
Expand All @@ -23,6 +24,7 @@ export interface TableColumnAnchorColumnConfig {
target?: string;
type?: string;
download?: string;
placeholder?: string;
}

declare global {
Expand All @@ -35,7 +37,11 @@ declare global {
* A table column for displaying links.
*/
export class TableColumnAnchor extends mixinGroupableColumnAPI(
mixinFractionalWidthColumnAPI(TableColumn<TableColumnAnchorColumnConfig>)
mixinFractionalWidthColumnAPI(
mixinColumnWithPlaceholderAPI(
TableColumn<TableColumnAnchorColumnConfig>
)
)
) {
@attr({ attribute: 'label-field-name' })
public labelFieldName?: string;
Expand Down Expand Up @@ -70,6 +76,10 @@ export class TableColumnAnchor extends mixinGroupableColumnAPI(
@attr
public download?: string;

public placeholderChanged(): void {
this.updateColumnConfig();
}

protected override getColumnInternalsOptions(): ColumnInternalsOptions {
return {
cellRecordFieldNames: ['label', 'href'],
Expand Down Expand Up @@ -141,7 +151,8 @@ export class TableColumnAnchor extends mixinGroupableColumnAPI(
rel: this.rel,
target: this.target,
type: this.type,
download: this.download
download: this.download,
placeholder: this.placeholder
};
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import {
controlLabelFont,
controlLabelFontColor
} from '../../../theme-provider/design-tokens';
import {
placeholderStates,
type PlaceholderState
} from '../../../utilities/tests/states';

const metadata: Meta = {
title: 'Tests/Table Column: Anchor',
Expand Down Expand Up @@ -50,33 +54,41 @@ const appearanceStates: [string, string | undefined][] = Object.entries(
).map(([key, value]) => [pascalCase(key), value]);
type AppearanceState = (typeof appearanceStates)[number];

const underlineHiddenStates: [string, boolean][] = [
const underlineHiddenStates = [
['Underline Hidden', true],
['', false]
];
] as const;
type UnderlineHiddenState = (typeof underlineHiddenStates)[number];

// prettier-ignore
const component = (
[appearanceName, appearance]: AppearanceState,
[underlineHiddenName, underlineHidden]: UnderlineHiddenState
[underlineHiddenName, underlineHidden]: UnderlineHiddenState,
[placeholderName, placeholder]: PlaceholderState
): ViewTemplate => html`
<label style="color: var(${controlLabelFontColor.cssCustomProperty}); font: var(${controlLabelFont.cssCustomProperty})">${appearanceName} ${underlineHiddenName} Anchor Table Column</label>
<label style="color: var(${controlLabelFontColor.cssCustomProperty}); font: var(${controlLabelFont.cssCustomProperty})">
${appearanceName} ${underlineHiddenName} Anchor Table Column ${placeholderName}
</label>
<${tableTag} id-field-name="id" style="height: 320px">
<${tableColumnAnchorTag}
label-field-name="firstName"
href-field-name="link"
group-index="0"
appearance="${() => appearance}"
?underline-hidden="${() => underlineHidden}"
placeholder="${() => placeholder}"
>
<${iconUserTag}></${iconUserTag}>
</${tableColumnAnchorTag}>
</${tableTag}>
`;

export const tableColumnAnchorThemeMatrix: StoryFn = createMatrixThemeStory(
createMatrix(component, [appearanceStates, underlineHiddenStates])
createMatrix(component, [
appearanceStates,
underlineHiddenStates,
placeholderStates
])
);

tableColumnAnchorThemeMatrix.play = async (): Promise<void> => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,21 @@ The <Tag name={tableColumnAnchorTag}/> column is used to display string fields a
<Canvas of={tableColumnAnchorStories.anchorColumn} />
<Controls of={tableColumnAnchorStories.anchorColumn} />

## Target Configuration
## Usage

### Best Practices
mollykreis marked this conversation as resolved.
Show resolved Hide resolved

- Provide meaningful, distinct labels for records that have a non-empty url.
- Do not provide `null`, `undefined`, empty, or whitespace labels with non-empty urls.
- Do not provide duplicate labels for different urls.
- If a label is not available or known for a url, the url itself may be explicitly provided for the label to ensure each distinct url has a distinct label. As grouping is done by label value, this prevents unrelated URLs from being grouped together.
- For records without a url, the label may also be omitted. All omitted labels should consistently use `null`, `undefined`, or empty string but not a combination of those values.

### Target Configuration

<TargetDocs />

## Angular Usage
### Angular Usage

In an Angular app, you can configure a callback to intercept clicks so that you may invoke the router to perform the navigation instead of the default handler:

Expand Down
Loading
Loading