Skip to content

Commit 5e27c34

Browse files
authored
[mercury][tabular-grid] Add "min-inline-size" to helper mixin (#568)
* `[mercury][tabular-grid]` Add "min-inline-size" to helper mixin * `[mercury][tabular-grid]` Update test bundle
1 parent db56979 commit 5e27c34

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

packages/mercury/src/assets/scss/_helpers.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
$tabular-grid-cell-block-alignment: "start",
114114
$tabular-grid-cell-inline-alignment: "start",
115115
$tabular-grid-cell-apply-ellipsis: false,
116+
$tabular-grid-cell-min-inline-size: 0,
116117
$tabular-grid-affected-columns-nth-list: null
117118
) {
118119
$selector: null;
@@ -197,5 +198,8 @@
197198
{
198199
@include cell-ellipsis();
199200
}
201+
@if $tabular-grid-cell-min-inline-size != "auto" {
202+
min-inline-size: $tabular-grid-cell-min-inline-size;
203+
}
200204
}
201205
}

packages/mercury/src/components/tabular-grid/_helpers.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
$tabular-grid-cell-block-alignment: "start",
7474
$tabular-grid-cell-inline-alignment: "start",
7575
$tabular-grid-cell-apply-ellipsis: false,
76+
$tabular-grid-cell-min-inline-size: 0,
7677
$tabular-grid-affected-columns-nth-list: null
7778
) {
7879
$selector: null;
@@ -157,5 +158,8 @@
157158
{
158159
@include cell-ellipsis();
159160
}
161+
@if $tabular-grid-cell-min-inline-size != "auto" {
162+
min-inline-size: $tabular-grid-cell-min-inline-size;
163+
}
160164
}
161165
}

packages/mercury/src/tests/bundles/expected-bundle-content/all.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@
365365
".tab::part(tab-list block-start) { border-block-end: var(--items-container__border-width) var(--items-container__border-style) var(--elevation-border-color, var(--items-container__border-color)); }",
366366
".tab::part(tab-list inline-end) { border-inline-start: var(--items-container__border-width) var(--items-container__border-style) var(--elevation-border-color, var(--items-container__border-color)); }",
367367
".tab::part(tab-list inline-start) { border-inline-end: var(--items-container__border-width) var(--items-container__border-style) var(--elevation-border-color, var(--items-container__border-color)); }",
368-
".tabular-grid ch-tabular-grid-cell { padding-block: var(--grid-cell__padding-block); padding-inline: var(--grid-cell__padding-inline); align-items: start; justify-content: start; }",
368+
".tabular-grid ch-tabular-grid-cell { padding-block: var(--grid-cell__padding-block); padding-inline: var(--grid-cell__padding-inline); align-items: start; justify-content: start; min-inline-size: 0px; }",
369369
".tabular-grid, .property-grid { --focus__outline-offset: -2px; --grid-label__gap: var(--mer-spacing--xs); --grid-common__gap: var(--mer-spacing--xs); max-block-size: 100%; --indent: 16px; background-color: var(--elevation-background-color, var(--items-container__bg-color)); border-color: var(--elevation-border-color, var(--items-container__border-color)); --item__border-color--enabled: var(--mer-surface__elevation--01); --grid-rowset-legend__font-size: var(--grid-base__font-size); --grid-rowset-legend__color: var(--grid-base__color); --grid-rowset-legend__color--hover: var(--item__color--hover); --grid-rowset-legend__padding-inline: var(--item__padding-inline); --grid-rowset-legend__padding-block: var(--mer-spacing--3xs); --grid-rowset-legend__indent: var(--mer-spacing--md); --grid-row-actions-show-on-row-hover__margin-inline-end: var( --mer-spacing--xs ); --grid-column-bar__gap: var(--mer-spacing--xs); --grid-column-bar__bg-color: var(--grid-base__bg-color); --grid-column-bar__color: var(--mer-text__bright); --grid-column-bar__padding-inline: var(--mer-spacing--xs); --grid-column-bar__padding-block: var(--mer-spacing--xs); --grid-column-bar__font-size: var(--grid-base__font-size); --grid-bar-resize-split__inline-size: var(--mer-spacing--2xs); --grid-bar-resize-split__bg-color: transparent; --grid-bar-resize-split__border-inline-end: var(--mer-border__width--sm) solid transparent; --grid-bar-resize-split__border-inline-end-color--hover: var( --grid-column-bar__color ); }",
370370
".tabular-grid-align-cells-block-center .tabular-grid-cell { align-items: center; }",
371371
".tabular-grid-align-cells-block-end .tabular-grid-cell { align-items: flex-end; }",

packages/mercury/src/tests/bundles/expected-bundle-content/components/tabular-grid.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
".property-grid-value-editing > .property-grid-cell:nth-child(2) { --control__border-width: 0; --control__border-color: transparent; --control__border-radius: 0; padding-block: 0px; padding-inline: 0px; --control__padding-inline: var(--grid-cell__padding-inline); display: grid; align-items: stretch; justify-content: stretch; }",
1313
".property-grid-value-editing > .property-grid-cell:nth-child(2):hover { outline: var(--focus__outline-width) var(--focus__outline-style) var(--control__border-color--hover); outline-offset: var(--focus__outline-offset); }",
1414
".property-grid:focus { outline: none; }",
15-
".tabular-grid ch-tabular-grid-cell { padding-block: var(--grid-cell__padding-block); padding-inline: var(--grid-cell__padding-inline); align-items: start; justify-content: start; }",
15+
".tabular-grid ch-tabular-grid-cell { padding-block: var(--grid-cell__padding-block); padding-inline: var(--grid-cell__padding-inline); align-items: start; justify-content: start; min-inline-size: 0px; }",
1616
".tabular-grid, .property-grid { --focus__outline-offset: -2px; --grid-label__gap: var(--mer-spacing--xs); --grid-common__gap: var(--mer-spacing--xs); max-block-size: 100%; --indent: 16px; background-color: var(--elevation-background-color, var(--items-container__bg-color)); border-color: var(--elevation-border-color, var(--items-container__border-color)); --item__border-color--enabled: var(--mer-surface__elevation--01); --grid-rowset-legend__font-size: var(--grid-base__font-size); --grid-rowset-legend__color: var(--grid-base__color); --grid-rowset-legend__color--hover: var(--item__color--hover); --grid-rowset-legend__padding-inline: var(--item__padding-inline); --grid-rowset-legend__padding-block: var(--mer-spacing--3xs); --grid-rowset-legend__indent: var(--mer-spacing--md); --grid-row-actions-show-on-row-hover__margin-inline-end: var( --mer-spacing--xs ); --grid-column-bar__gap: var(--mer-spacing--xs); --grid-column-bar__bg-color: var(--grid-base__bg-color); --grid-column-bar__color: var(--mer-text__bright); --grid-column-bar__padding-inline: var(--mer-spacing--xs); --grid-column-bar__padding-block: var(--mer-spacing--xs); --grid-column-bar__font-size: var(--grid-base__font-size); --grid-bar-resize-split__inline-size: var(--mer-spacing--2xs); --grid-bar-resize-split__bg-color: transparent; --grid-bar-resize-split__border-inline-end: var(--mer-border__width--sm) solid transparent; --grid-bar-resize-split__border-inline-end-color--hover: var( --grid-column-bar__color ); }",
1717
".tabular-grid, .property-grid, .tabular-grid-cell .combo-box, .property-grid-cell .combo-box, .tabular-grid-cell .input, .property-grid-cell .input { font-weight: var(--font-weight-regular); }",
1818
".tabular-grid, .property-grid, .tabular-grid-cell .combo-box, .property-grid-cell .combo-box, .tabular-grid-cell .input, .property-grid-cell .input, .tabular-grid-column { font-size: var(--font-size-body-s); }",

0 commit comments

Comments
 (0)