Skip to content

Commit 2bf4e30

Browse files
committed
Merge branch 'bug/PD-101708_Fix_small_bugs_reported_from_BICS_CR' into release/current
2 parents c433e50 + 5b274cb commit 2bf4e30

3 files changed

Lines changed: 68 additions & 29 deletions

File tree

src/_storybook/components/FormDemo/FormDemo.styles.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ export const FormDemoStyles = css`
3434
flex: 1 1 0;
3535
}
3636
37-
.form-container {
37+
/* Apply layout to the top-level slotted form container */
38+
::slotted(.form-container),
39+
::slotted(form) {
3840
display: flex;
3941
flex-direction: column;
4042
gap: 1.5rem;

src/components/col-drawer/col-drawer.stories.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ export const WithHeaderFooter: Story = {
275275
?nofocustrap=${nofocustrap}
276276
@overlay-click-outside=${onOverlayClickOutside}
277277
>
278-
<col-modal-header
279-
slot="header"
280-
title="Drawer Title"
281-
@on-close=${handleClose}
282-
></col-modal-header>
278+
<col-modal-header slot="header" title="Drawer Title" @on-close=${handleClose}>
279+
<col-button slot="actions" aria-label="Full screen">
280+
<col-icon name="three-dots-vertical" size="16"></col-icon>
281+
</col-button>
282+
</col-modal-header>
283283
284284
<div>
285285
<h3>Main Content Area</h3>
@@ -288,9 +288,10 @@ export const WithHeaderFooter: Story = {
288288
<p>The footer contains action buttons.</p>
289289
</div>
290290
291-
<col-modal-footer slot="footer" description="2 items selected">
292-
<col-button slot="actions" color="secondary" @click=${handleClose}>Cancel</col-button>
293-
<col-button slot="actions" color="primary" @click=${handleClose}>Save</col-button>
291+
<col-modal-footer slot="footer" description="This is helper text">
292+
<col-button slot="actions-left">Tertiary</col-button>
293+
<col-button slot="actions" @click=${handleClose}>Secondary</col-button>
294+
<col-button slot="actions" color="primary" @click=${handleClose}>Primary</col-button>
294295
</col-modal-footer>
295296
</col-drawer>
296297
</div>

src/components/col-table/col-table.stories.tsx

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,11 @@ export const FullFeaturedExample: Story = {
619619
};
620620

621621
return html`
622+
<style>
623+
col-toolbar::part(toolbar) {
624+
padding: 0;
625+
}
626+
</style>
622627
<col-table
623628
max-height="500px"
624629
min-height="300px"
@@ -627,21 +632,39 @@ export const FullFeaturedExample: Story = {
627632
@row-selected=${handleRowSelected}
628633
@all-rows-selected=${handleAllRowsSelected}
629634
>
630-
<div slot="table-header" style="padding: 16px; background: #f5f5f5;">
631-
<div style="display: flex; justify-content: space-between; align-items: center;">
632-
<div>
633-
<h3 style="margin: 0;">Order Management</h3>
634-
<p style="margin: 8px 0 0 0; color: #666;">Track and manage customer orders</p>
635+
<div slot="table-header">
636+
<col-toolbar gap="none">
637+
<div
638+
style="display: flex; justify-content: space-between; align-items: center; gap: 2px"
639+
>
640+
<col-icon name="file" size="20"></col-icon>
641+
<col-typography variant="subheading">
642+
Order Management
643+
<col-tooltip slot="icon" position="top">
644+
<col-icon name="info-circle" size="14px"></col-icon>
645+
<span slot="tooltip-content">Track and manage customer orders</span>
646+
</col-tooltip>
647+
</col-typography>
635648
</div>
636-
<div style="display: flex; gap: 8px;">
637-
<col-text-field
638-
placeholder="Search orders..."
639-
size="small"
640-
style="width: 200px;"
641-
></col-text-field>
642-
<col-button color="primary" size="small">New Order</col-button>
649+
<col-spacer></col-spacer>
650+
<div
651+
style="display: flex; justify-content: space-between; align-items: center; gap: 2px"
652+
>
653+
<col-group orientation="horizontal" withoutgap>
654+
<col-search-bar
655+
placeholder="Type to search..."
656+
mode="static"
657+
custom-width="100%"
658+
></col-search-bar>
659+
<col-button size="small">
660+
<col-icon name="filter" size="16px"></col-icon>
661+
</col-button>
662+
<col-button size="small">
663+
<col-icon name="table" size="16px"></col-icon>
664+
</col-button>
665+
</col-group>
643666
</div>
644-
</div>
667+
</col-toolbar>
645668
</div>
646669
647670
<col-table-head>
@@ -654,7 +677,7 @@ export const FullFeaturedExample: Story = {
654677
<col-table-cell header>Actions</col-table-cell>
655678
</col-table-head>
656679
<col-table-body>
657-
${[...Array(15)].map(
680+
${[...Array(10)].map(
658681
(_, i) => html`
659682
<col-table-row row-index="${i + 1}" ?selectable=${true}>
660683
<col-table-cell>ORD-${String(1001 + i).padStart(4, '0')}</col-table-cell>
@@ -680,7 +703,7 @@ export const FullFeaturedExample: Story = {
680703
Actions
681704
<col-icon name="chevron-down" size="12"></col-icon>
682705
</col-button>
683-
<col-list-menu slot="content">
706+
<col-list-menu>
684707
<col-list-menu-item>View Details</col-list-menu-item>
685708
<col-list-menu-item>Edit Order</col-list-menu-item>
686709
<col-list-menu-item>Send Invoice</col-list-menu-item>
@@ -693,11 +716,24 @@ export const FullFeaturedExample: Story = {
693716
)}
694717
</col-table-body>
695718
696-
<div slot="table-footer" style="padding: 16px; background: #f5f5f5;">
697-
<div style="display: flex; justify-content: space-between; align-items: center;">
698-
<div style="color: #666;">Showing 1-15 of 100 orders</div>
699-
<col-paginator length="7" value="1"></col-paginator>
700-
</div>
719+
<div slot="table-footer">
720+
<col-toolbar gap="none">
721+
<col-toolbar gap="small">
722+
<span class="text-xs">Items per page</span>
723+
<col-select id="items-per-page" value="10" custom-width="60px">
724+
<col-list-menu>
725+
<col-list-menu-item value="5">5</col-list-menu-item>
726+
<col-list-menu-item value="10">10</col-list-menu-item>
727+
<col-list-menu-item value="20">20</col-list-menu-item>
728+
<col-list-menu-item value="50">50</col-list-menu-item>
729+
<col-list-menu-item value="100">100</col-list-menu-item>
730+
</col-list-menu>
731+
</col-select>
732+
<col-divider orientation="vertical" style="height: 32px"></col-divider>
733+
<span id="items-info" class="text-xs" role="status" aria-live="polite"></span>
734+
</col-toolbar>
735+
<col-paginator id="paginator" length="4" value="1" align="end"></col-paginator>
736+
</col-toolbar>
701737
</div>
702738
</col-table>
703739
`;

0 commit comments

Comments
 (0)