Skip to content

Commit ed0c46c

Browse files
bdenhambdenham
authored
Merge branch 'develop' into initial-quote-management-dropin-docs
2 parents adcf093 + da6262a commit ed0c46c

File tree

8 files changed

+235
-93
lines changed

8 files changed

+235
-93
lines changed

‎src/components/Option.astro‎

Lines changed: 74 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,85 +3,87 @@
33
---
44

55
<div class="ac-option">
6-
<slot />
6+
<slot />
77
</div>
88

99
<style is:global>
10-
.ac-option.ac-option {
11-
margin-top: 0;
12-
margin-bottom: 1rem;
13-
margin-left: -1.5rem;
14-
overflow-wrap: break-word;
15-
padding-left: 1rem;
16-
padding-right: 1rem;
17-
padding-bottom: 1rem;
18-
border: 1px solid var(--sl-color-gray-4);
19-
border-radius: 0.3rem;
20-
margin-top: 3rem;
21-
}
10+
.ac-option.ac-option {
11+
margin-top: 0;
12+
margin-bottom: 1rem;
13+
margin-left: -1.5rem;
14+
overflow-wrap: break-word;
15+
padding-left: 1rem;
16+
padding-right: 1rem;
17+
padding-bottom: 1rem;
18+
border: 1px solid var(--sl-color-gray-4);
19+
border-radius: 0.3rem;
20+
margin-top: 3rem;
21+
}
2222

23-
.ac-option.ac-option > h3 {
24-
counter-increment: option;
25-
color: var(--sl-color-gray-1);
26-
padding-left: 0;
27-
margin-bottom: 0.5rem;
28-
margin-top: -0.8rem;
29-
padding-top: 0;
30-
margin-left: -1.1rem;
31-
background-color: var(--sl-color-black);
32-
display: table;
33-
padding-right: 0.4rem;
23+
.ac-option.ac-option > h3 {
24+
counter-increment: option;
25+
color: var(--sl-color-gray-1);
26+
padding-left: 0;
27+
margin-bottom: 0.5rem;
28+
margin-top: -0.8rem;
29+
padding-top: 0;
30+
margin-left: -1.1rem;
31+
background-color: var(--sl-color-black);
32+
display: table;
33+
padding-right: 0.4rem;
34+
}
35+
36+
.ac-option.ac-option > h3::before {
37+
content: var(--option-label, "Option") " " counter(option);
38+
border-radius: 0.2rem;
39+
display: inline-block;
40+
text-align: center;
41+
color: var(--sl-color-black);
42+
min-width: 4rem;
43+
width: auto;
44+
padding: 0.25rem 0.5rem 0.5rem 0.5rem;
45+
line-height: normal;
46+
font-size: 1.1rem;
47+
margin-left: -0.5rem;
48+
margin-top: 0;
49+
margin-right: 0.5rem;
50+
position: relative;
51+
color: var(--sl-color-black);
52+
background-color: var(--sl-color-accent);
53+
}
54+
55+
/* Print-specific styles */
56+
@media print {
57+
.ac-option.ac-option {
58+
background-color: #fff;
59+
color: #000;
60+
border: none;
61+
page-break-after: always;
62+
page-break-inside: avoid;
3463
}
3564

3665
.ac-option.ac-option > h3::before {
37-
content: "Option " counter(option);
38-
border-radius: 0.2rem;
39-
display: inline-block;
40-
text-align: center;
41-
color: var(--sl-color-black);
42-
width: 4rem;
43-
height: 1.5rem;
44-
line-height: normal;
45-
font-size: 1rem;
46-
margin-left: -0.5rem;
47-
margin-top: 0;
48-
margin-right: 0.5rem;
49-
position: relative;
50-
color: var(--sl-color-black);
51-
background-color: var(--sl-color-accent);
52-
vertical-align: text-top;
66+
content: var(--option-label, "Option") " " counter(option);
67+
border-radius: 0.2rem;
68+
display: inline-block;
69+
text-align: center;
70+
color: var(--sl-color-black);
71+
min-width: 4rem;
72+
width: auto;
73+
padding: 0 0.5rem;
74+
height: 1.5rem;
75+
line-height: normal;
76+
font-size: 1rem;
77+
margin-left: -1.5rem;
78+
margin-top: -2.75rem;
79+
margin-right: 0.5rem;
80+
position: relative;
81+
color: var(--sl-color-black);
82+
background-color: var(--sl-color-accent);
5383
}
54-
55-
/* Print-specific styles */
56-
@media print {
57-
.ac-option.ac-option {
58-
background-color: #fff;
59-
color: #000;
60-
border: none;
61-
page-break-after: always;
62-
page-break-inside: avoid;
63-
}
64-
65-
.ac-option.ac-option > h3::before {
66-
content: "Option " counter(option);
67-
border-radius: 0.2rem;
68-
display: inline-block;
69-
text-align: center;
70-
color: var(--sl-color-black);
71-
width: 4rem;
72-
height: 1.5rem;
73-
line-height: normal;
74-
font-size: 1rem;
75-
margin-left: -1.5rem;
76-
margin-top: -2.75rem;
77-
margin-right: 0.5rem;
78-
position: relative;
79-
color: var(--sl-color-black);
80-
background-color: var(--sl-color-accent);
81-
}
82-
.ac-option.ac-option > h3 {
83-
margin-top: 0;
84-
margin-bottom: 0.75rem;
85-
}
84+
.ac-option.ac-option > h3 {
85+
margin-top: 0;
86+
margin-bottom: 0.75rem;
8687
}
88+
}
8789
</style>

‎src/components/Options.astro‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
---
2+
interface Props {
3+
label?: string; // Customize the label (e.g., "Strategy", "Approach", etc.)
4+
}
25
6+
const { label = "Option" } = Astro.props;
37
---
48

5-
<div class="ac-options">
6-
<slot />
9+
<div class="ac-options" style={`--option-label: "${label}"`}>
10+
<slot />
711
</div>
812

913
<style is:global>
10-
.ac-options.ac-options {
11-
counter-reset: option;
12-
padding-left: 1.5rem;
13-
margin-left: 0.35rem;
14-
margin-top: -1rem;
15-
}
14+
.ac-options.ac-options {
15+
counter-reset: option;
16+
padding-left: 1.5rem;
17+
margin-left: 0.35rem;
18+
margin-top: -1rem;
19+
}
1620

17-
@media print {
18-
.ac-options.ac-options {
19-
padding-left: 0;
20-
}
21+
@media print {
22+
.ac-options.ac-options {
23+
padding-left: 0;
2124
}
25+
}
2226
</style>

‎src/components/TableWrapper.astro‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
---
2+
/**
3+
* Wrapper component for Markdown tables that adds no-wrap column support
4+
*
5+
* Usage:
6+
* <TableWrapper nowrap={[0, 2]}>
7+
*
8+
* | File | Purpose | Update Frequency | Typical Changes |
9+
* |------|---------|------------------|-----------------|
10+
* | `scripts/aem.js` | Core AEM functionality | Very Rare | Core platform improvements |
11+
* | `scripts/scripts.js` | Page loading... | Very Rare | Performance optimizations |
12+
*
13+
* </TableWrapper>
14+
*/
15+
16+
interface Props {
17+
nowrap?: number[]; // Column indices that should not wrap (0-based)
18+
}
19+
20+
const { nowrap = [] } = Astro.props;
21+
---
22+
23+
<div class="table-wrapper" data-nowrap-columns={nowrap.join(",")}>
24+
<slot />
25+
</div>
26+
27+
<style is:global>
28+
.table-wrapper {
29+
overflow-x: auto;
30+
margin-bottom: 1rem;
31+
}
32+
33+
.table-wrapper table {
34+
width: 100%;
35+
border-collapse: collapse;
36+
}
37+
38+
/* Apply nowrap to specific columns based on data attribute */
39+
.table-wrapper[data-nowrap-columns] th,
40+
.table-wrapper[data-nowrap-columns] td {
41+
white-space: normal; /* Default: allow wrapping */
42+
}
43+
44+
/* Column 0 - nowrap */
45+
.table-wrapper[data-nowrap-columns*="0"] th:nth-child(1),
46+
.table-wrapper[data-nowrap-columns*="0"] td:nth-child(1) {
47+
white-space: nowrap;
48+
}
49+
50+
/* Column 1 - nowrap */
51+
.table-wrapper[data-nowrap-columns*="1"] th:nth-child(2),
52+
.table-wrapper[data-nowrap-columns*="1"] td:nth-child(2) {
53+
white-space: nowrap;
54+
}
55+
56+
/* Column 2 - nowrap */
57+
.table-wrapper[data-nowrap-columns*="2"] th:nth-child(3),
58+
.table-wrapper[data-nowrap-columns*="2"] td:nth-child(3) {
59+
white-space: nowrap;
60+
}
61+
62+
/* Column 3 - nowrap */
63+
.table-wrapper[data-nowrap-columns*="3"] th:nth-child(4),
64+
.table-wrapper[data-nowrap-columns*="3"] td:nth-child(4) {
65+
white-space: nowrap;
66+
}
67+
68+
/* Column 4 - nowrap */
69+
.table-wrapper[data-nowrap-columns*="4"] th:nth-child(5),
70+
.table-wrapper[data-nowrap-columns*="4"] td:nth-child(5) {
71+
white-space: nowrap;
72+
}
73+
74+
/* Column 5 - nowrap */
75+
.table-wrapper[data-nowrap-columns*="5"] th:nth-child(6),
76+
.table-wrapper[data-nowrap-columns*="5"] td:nth-child(6) {
77+
white-space: nowrap;
78+
}
79+
80+
/* Column 6 - nowrap */
81+
.table-wrapper[data-nowrap-columns*="6"] th:nth-child(7),
82+
.table-wrapper[data-nowrap-columns*="6"] td:nth-child(7) {
83+
white-space: nowrap;
84+
}
85+
86+
/* Column 7 - nowrap */
87+
.table-wrapper[data-nowrap-columns*="7"] th:nth-child(8),
88+
.table-wrapper[data-nowrap-columns*="7"] td:nth-child(8) {
89+
white-space: nowrap;
90+
}
91+
92+
/* Column 8 - nowrap */
93+
.table-wrapper[data-nowrap-columns*="8"] th:nth-child(9),
94+
.table-wrapper[data-nowrap-columns*="8"] td:nth-child(9) {
95+
white-space: nowrap;
96+
}
97+
98+
/* Column 9 - nowrap */
99+
.table-wrapper[data-nowrap-columns*="9"] th:nth-child(10),
100+
.table-wrapper[data-nowrap-columns*="9"] td:nth-child(10) {
101+
white-space: nowrap;
102+
}
103+
</style>

‎src/content/docs/releases/changelog.mdx‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,25 @@ import ChangelogEntry from '@components/changelog/ChangelogEntry.astro';
296296
**Storefront Compatibility Package**
297297
************************************/}
298298

299+
<ChangelogEntry
300+
date="2025-10-08"
301+
title="Storefront Compatibility Package v4.8.8"
302+
components={['Storefront Compatibility Package']}
303+
>
304+
The Storefront Compatibility Package has been updated to include the following changes:
305+
306+
- **Customer ID**: Removed the deprecation notice for the GraphQL `Customer.id` field. This field returns the correct value that can be reused for B2B company management mutations/queries.
307+
- **Negotiable Quote Address**: Aligned multiple address input types to support customer address UIDs, deprecating customer address IDs. Introduced the `deleteCustomerAddressV2` and `updateCustomerAddressV2` mutations and deprecated the previous versions.
308+
</ChangelogEntry>
309+
<ChangelogEntry
310+
date="2025-10-08"
311+
title="Storefront Compatibility Package v4.7.11 (Internal)"
312+
components={['Storefront Compatibility Package']}
313+
>
314+
The Storefront Compatibility Package has been updated to include the following changes:
315+
316+
- **Negotiable Quote Address**: Aligned multiple address input types to support customer address UIDs, deprecating customer address IDs. Introduced the `deleteCustomerAddressV2` and `updateCustomerAddressV2` mutations and deprecated the previous versions.
317+
</ChangelogEntry>
299318
<ChangelogEntry
300319
date="2025-09-08"
301320
title="Storefront Compatibility Package v4.8.7, v4.7.10"
@@ -719,4 +738,4 @@ import ChangelogEntry from '@components/changelog/ChangelogEntry.astro';
719738
</ChangelogEntry>
720739

721740
</div>
722-
</div>
741+
</div>

‎src/content/docs/releases/index.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ This section provides details about the compatibility between Commerce Storefron
9898

9999
| Adobe Commerce | Storefront Compatibility Package |
100100
|----------------|----------------------------------|
101-
| `2.4.7` | `4.7.10` |
102-
| `2.4.8` | `4.8.7` |
101+
| `2.4.7` | `4.7.11` |
102+
| `2.4.8` | `4.8.8` |
103103

104104
**Drop-in SDK package updates:**
105105

‎src/content/docs/setup/configuration/storefront-compatibility/install.mdx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,15 @@ Use this method to install the Storefront Compatibility Package using the Cloud
4141
Use the appropriate package version based on your Adobe Commerce version:
4242

4343
For Adobe Commerce 2.4.7, run:
44+
4445
```bash
45-
composer require adobe-commerce/storefront-compatibility:4.7.10
46+
composer require adobe-commerce/storefront-compatibility:4.7.11
4647
```
48+
4749
For Adobe Commerce 2.4.8, run:
50+
4851
```bash
49-
composer require adobe-commerce/storefront-compatibility:4.8.7
52+
composer require adobe-commerce/storefront-compatibility:4.8.8
5053
```
5154

5255
To check the latest version of the Storefront Compatibility Package, go to the [changelog](/releases/changelog/).
@@ -80,12 +83,15 @@ Use this method to install the Storefront Compatibility Package for an on-premis
8083
Use the appropriate package version based on your Adobe Commerce version:
8184

8285
For Adobe Commerce 2.4.7, run:
86+
8387
```bash
84-
composer require adobe-commerce/storefront-compatibility:4.7.10
88+
composer require adobe-commerce/storefront-compatibility:4.7.11
8589
```
90+
8691
For Adobe Commerce 2.4.8, run:
92+
8793
```bash
88-
composer require adobe-commerce/storefront-compatibility:4.8.7
94+
composer require adobe-commerce/storefront-compatibility:4.8.8
8995
```
9096

9197
To check the latest version of the Storefront Compatibility Package, go to the [changelog](/releases/changelog/).

0 commit comments

Comments
 (0)