@ndla/primitives 1.0.43-alpha.0 → 1.0.44-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -53,39 +53,42 @@
53
53
  "borderWidth]___[value:0 1px 1px",
54
54
  "borderStyle]___[value:solid",
55
55
  "borderColor]___[value:stroke.default",
56
- "marginBlock]___[value:small]___[cond:& > li",
56
+ "marginInlineStart]___[value:small",
57
+ "paddingInlineStart]___[value:small",
57
58
  "position]___[value:absolute]___[cond:& > li<___>_before",
58
- "transform]___[value:translateX(-100%)]___[cond:& > li<___>_before",
59
- "paddingInlineEnd]___[value:0.25ch]___[cond:& > li<___>_before",
59
+ "transform]___[value:translateX(calc(-100% + (token(spacing.small) * -1)))]___[cond:& > li<___>_before",
60
60
  "fontVariantNumeric]___[value:tabular-nums]___[cond:& > li<___>_before",
61
- "marginInlineStart]___[value:3ch",
62
- "marginInlineStart]___[value:2.5ch]___[cond:& > li > ol",
61
+ "marginBlock]___[value:small]___[cond:& li",
62
+ "marginInlineStart]___[value:0]___[cond:& > ol:not([data-variant='letters'])",
63
+ "paddingInlineStart]___[value:0]___[cond:& > ol:not([data-variant='letters'])",
63
64
  "counterReset]___[value:level1",
64
65
  "counterReset]___[value:level1 var(--start, 0)]___[cond:&[data-count='true']",
65
66
  "counterIncrement]___[value:level1]___[cond:& > li",
66
67
  "content]___[value:counter(level1, decimal) '. ']___[cond:& > li<___>_before",
67
68
  "counterReset]___[value:level2]___[cond:& > li<___>& > ol:not([data-variant='letters'])",
68
69
  "counterReset]___[value:level2 var(--start, 0)]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>&[data-count='true']",
69
- "marginInlineStart]___[value:1ch]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
70
+ "marginInlineStart]___[value:small]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
70
71
  "counterIncrement]___[value:level2]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
71
72
  "content]___[value:counter(level1, decimal) '.' counter(level2, decimal) '. ']___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>_before",
72
73
  "counterReset]___[value:level3]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])",
73
74
  "counterReset]___[value:level3 var(--start, 0)]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>&[data-count='true']",
74
- "marginInlineStart]___[value:2.5ch]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
75
+ "marginInlineStart]___[value:calc(1.5ch + token(spacing.small))]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
75
76
  "counterIncrement]___[value:level3]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
76
77
  "content]___[value:counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '. ']___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>_before",
77
78
  "counterReset]___[value:level4]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])",
78
79
  "counterReset]___[value:level4 var(--start, 0)]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>&[data-count='true']",
79
- "marginInlineStart]___[value:4.5ch]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
80
+ "marginInlineStart]___[value:calc(3ch + token(spacing.small))]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
80
81
  "counterIncrement]___[value:level4]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li",
81
82
  "content]___[value:counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.' counter(level4, decimal) '. ']___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>_before",
82
- "marginInlineStart]___[value:0.5ch]___[cond:& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol:not([data-variant='letters'])<___>& > li<___>& > ol[data-variant='letters'] > li",
83
+ "marginInlineStart]___[value:0]___[cond:& > ol[data-variant='letters']",
84
+ "paddingInlineStart]___[value:0]___[cond:& > ol[data-variant='letters']",
83
85
  "content]___[value:counter(level1, upper-alpha) '. ']___[cond:& > li<___>_before",
84
86
  "content]___[value:counter(level1, lower-alpha) '. ']___[cond:& > li<___>& > ol[data-variant='letters'] > li<___>_before",
85
87
  "content]___[value:counter(level1, lower-roman) '. ']___[cond:& > li<___>& > ol[data-variant='letters'] > li<___>& > ol[data-variant='letters'] > li<___>_before",
86
88
  "listStyle]___[value:revert",
87
- "paddingInlineStart]___[value:3ch",
88
- "marginBlock]___[value:small]___[cond:& li",
89
+ "marginInlineStart]___[value:medium",
90
+ "marginInlineStart]___[value:0]___[cond:& ul",
91
+ "paddingInlineStart]___[value:small]___[cond:& li",
89
92
  "color]___[value:icon.strong]___[cond:& li<___>_marker",
90
93
  "fontWeight]___[value:bold]___[cond:& dt",
91
94
  "marginInlineStart]___[value:medium]___[cond:& dd",
@@ -325,7 +328,7 @@
325
328
  "padding]___[value:medium",
326
329
  "clear]___[value:both",
327
330
  "padding]___[value:medium]___[cond:_open",
328
- "marginBlockEnd]___[value:-xxsmall]___[cond:_open<___>& summary",
331
+ "marginBlockEnd]___[value:-xxsmall]___[cond:_open<___>& summary, [data-embed-type='expandable-box-summary']",
329
332
  "margin]___[value:-medium",
330
333
  "textStyle]___[value:label.large!",
331
334
  "display]___[value:inline!]___[cond:& > *",
@@ -348,7 +351,6 @@
348
351
  "marginBlock]___[value:xsmall",
349
352
  "marginInlineEnd]___[value:medium",
350
353
  "marginInlineEnd]___[value:0]___[cond:tabletDown",
351
- "marginInlineStart]___[value:medium",
352
354
  "marginInlineStart]___[value:0]___[cond:tabletDown",
353
355
  "marginInlineStart]___[value:0",
354
356
  "marginInlineEnd]___[value:0",
package/dist/styles.css CHANGED
@@ -170,8 +170,12 @@
170
170
  border-bottom-right-radius: var(--radii-xsmall);
171
171
  }
172
172
 
173
- .ms_3ch {
174
- margin-inline-start: 3ch;
173
+ .ms_small {
174
+ margin-inline-start: var(--spacing-small);
175
+ }
176
+
177
+ .ps_small {
178
+ padding-inline-start: var(--spacing-small);
175
179
  }
176
180
 
177
181
  .counter-reset_level1 {
@@ -182,8 +186,8 @@
182
186
  list-style: revert;
183
187
  }
184
188
 
185
- .ps_3ch {
186
- padding-inline-start: 3ch;
189
+ .ms_medium {
190
+ margin-inline-start: var(--spacing-medium);
187
191
  }
188
192
 
189
193
  .px_xsmall {
@@ -560,10 +564,6 @@
560
564
  margin-inline-end: var(--spacing-medium);
561
565
  }
562
566
 
563
- .ms_medium {
564
- margin-inline-start: var(--spacing-medium);
565
- }
566
-
567
567
  .ms_0 {
568
568
  margin-inline-start: 0;
569
569
  }
@@ -1477,12 +1477,16 @@
1477
1477
  animation: var(--animations-collapse-out);
1478
1478
  }
1479
1479
 
1480
- .\[\&_\>_li\]\:my_small > li {
1480
+ .\[\&_li\]\:my_small li {
1481
1481
  margin-block: var(--spacing-small);
1482
1482
  }
1483
1483
 
1484
- .\[\&_\>_li_\>_ol\]\:ms_2\.5ch > li > ol {
1485
- margin-inline-start: 2.5ch;
1484
+ .\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:ms_0 > ol:not([data-variant='letters']) {
1485
+ margin-inline-start: 0;
1486
+ }
1487
+
1488
+ .\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:ps_0 > ol:not([data-variant='letters']) {
1489
+ padding-inline-start: 0;
1486
1490
  }
1487
1491
 
1488
1492
  .\[\&\[data-count\=\'true\'\]\]\:counter-reset_level1_var\(--start\,_0\)[data-count='true'] {
@@ -1493,8 +1497,20 @@
1493
1497
  counter-increment: level1;
1494
1498
  }
1495
1499
 
1496
- .\[\&_li\]\:my_small li {
1497
- margin-block: var(--spacing-small);
1500
+ .\[\&_\>_ol\[data-variant\=\'letters\'\]\]\:ms_0 > ol[data-variant='letters'] {
1501
+ margin-inline-start: 0;
1502
+ }
1503
+
1504
+ .\[\&_\>_ol\[data-variant\=\'letters\'\]\]\:ps_0 > ol[data-variant='letters'] {
1505
+ padding-inline-start: 0;
1506
+ }
1507
+
1508
+ .\[\&__ul\]\:ms_0 ul {
1509
+ margin-inline-start: 0;
1510
+ }
1511
+
1512
+ .\[\&_li\]\:ps_small li {
1513
+ padding-inline-start: var(--spacing-small);
1498
1514
  }
1499
1515
 
1500
1516
  .\[\&_dd\]\:ms_medium dd {
@@ -2394,12 +2410,8 @@
2394
2410
  position: absolute;
2395
2411
  }
2396
2412
 
2397
- .\[\&_\>_li\]\:before\:trf_translateX\(-100\%\) > li::before {
2398
- transform: translateX(-100%);
2399
- }
2400
-
2401
- .\[\&_\>_li\]\:before\:pe_0\.25ch > li::before {
2402
- padding-inline-end: 0.25ch;
2413
+ .\[\&_\>_li\]\:before\:trf_translateX\(calc\(-100\%_\+_\(token\(spacing\.small\)_\*_-1\)\)\) > li::before {
2414
+ transform: translateX(calc(-100% + (var(--spacing-small) * -1)));
2403
2415
  }
2404
2416
 
2405
2417
  .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:counter-reset_level2 > li > ol:not([data-variant='letters']) {
@@ -2482,7 +2494,7 @@
2482
2494
  transform: rotate(180deg);
2483
2495
  }
2484
2496
 
2485
- .open\:\[\&_summary\]\:mbe_-xxsmall:is([open], [data-open], [data-state="open"]) summary {
2497
+ .open\:\[\&_summary\,_\[data-embed-type\=\'expandable-box-summary\'\]\]\:mbe_-xxsmall:is([open], [data-open], [data-state="open"]) summary,.open\:\[\&_summary\,_\[data-embed-type\=\'expandable-box-summary\'\]\]\:mbe_-xxsmall:is([open], [data-open], [data-state="open"]) [data-embed-type='expandable-box-summary'] {
2486
2498
  margin-block-end: calc(var(--spacing-xxsmall) * -1);
2487
2499
  }
2488
2500
 
@@ -2692,8 +2704,8 @@
2692
2704
  counter-reset: level2 var(--start, 0);
2693
2705
  }
2694
2706
 
2695
- .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_1ch > li > ol:not([data-variant='letters']) > li {
2696
- margin-inline-start: 1ch;
2707
+ .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_small > li > ol:not([data-variant='letters']) > li {
2708
+ margin-inline-start: var(--spacing-small);
2697
2709
  }
2698
2710
 
2699
2711
  .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:counter-increment_level2 > li > ol:not([data-variant='letters']) > li {
@@ -2752,8 +2764,8 @@
2752
2764
  counter-reset: level3 var(--start, 0);
2753
2765
  }
2754
2766
 
2755
- .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_2\.5ch > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
2756
- margin-inline-start: 2.5ch;
2767
+ .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_calc\(1\.5ch_\+_token\(spacing\.small\)\) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
2768
+ margin-inline-start: calc(1.5ch + var(--spacing-small));
2757
2769
  }
2758
2770
 
2759
2771
  .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:counter-increment_level3 > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
@@ -2772,18 +2784,14 @@
2772
2784
  counter-reset: level4 var(--start, 0);
2773
2785
  }
2774
2786
 
2775
- .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_4\.5ch > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
2776
- margin-inline-start: 4.5ch;
2787
+ .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:ms_calc\(3ch_\+_token\(spacing\.small\)\) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
2788
+ margin-inline-start: calc(3ch + var(--spacing-small));
2777
2789
  }
2778
2790
 
2779
2791
  .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:counter-increment_level4 > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li {
2780
2792
  counter-increment: level4;
2781
2793
  }
2782
2794
 
2783
- .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\[data-variant\=\'letters\'\]_\>_li\]\:ms_0\.5ch > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol[data-variant='letters'] > li {
2784
- margin-inline-start: 0.5ch;
2785
- }
2786
-
2787
2795
  .\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:\[\&_\>_ol\:not\(\[data-variant\=\'letters\'\]\)\]\:\[\&_\>_li\]\:before\:content_counter\(level1\,_decimal\)_\'\.\'_counter\(level2\,_decimal\)_\'\.\'_counter\(level3\,_decimal\)_\'\.\'_counter\(level4\,_decimal\)_\'\._\' > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li > ol:not([data-variant='letters']) > li::before {
2788
2796
  content: counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.' counter(level4, decimal) '. ';
2789
2797
  }
@@ -17,18 +17,17 @@ const NUMBER_LIST = "& > ol:not([data-variant='letters'])";
17
17
  const LETTER_LIST_ITEM = `${LETTER_LIST} > li`;
18
18
  const orderedListRecipe = cva({
19
19
  base: {
20
+ marginInlineStart: "small",
21
+ paddingInlineStart: "small",
20
22
  [LIST_ITEM]: {
21
- marginBlock: "small",
22
23
  _before: {
23
24
  position: "absolute",
24
- transform: "translateX(-100%)",
25
- paddingInlineEnd: "0.25ch",
25
+ transform: "translateX(calc(-100% + (token(spacing.small) * -1)))",
26
26
  fontVariantNumeric: "tabular-nums"
27
27
  }
28
28
  },
29
- marginInlineStart: "3ch",
30
- "& > li > ol": {
31
- marginInlineStart: "2.5ch"
29
+ "& li": {
30
+ marginBlock: "small"
32
31
  }
33
32
  },
34
33
  defaultVariants: {
@@ -37,6 +36,10 @@ const orderedListRecipe = cva({
37
36
  variants: {
38
37
  variant: {
39
38
  numbers: {
39
+ [NUMBER_LIST]: {
40
+ marginInlineStart: "0",
41
+ paddingInlineStart: "0"
42
+ },
40
43
  counterReset: "level1",
41
44
  "&[data-count='true']": {
42
45
  counterReset: "level1 var(--start, 0)"
@@ -52,7 +55,7 @@ const orderedListRecipe = cva({
52
55
  counterReset: "level2 var(--start, 0)"
53
56
  },
54
57
  [LIST_ITEM]: {
55
- marginInlineStart: "1ch",
58
+ marginInlineStart: "small",
56
59
  counterIncrement: "level2",
57
60
  _before: {
58
61
  content: "counter(level1, decimal) '.' counter(level2, decimal) '. '"
@@ -63,7 +66,7 @@ const orderedListRecipe = cva({
63
66
  counterReset: "level3 var(--start, 0)"
64
67
  },
65
68
  [LIST_ITEM]: {
66
- marginInlineStart: "2.5ch",
69
+ marginInlineStart: "calc(1.5ch + token(spacing.small))",
67
70
  counterIncrement: "level3",
68
71
  _before: {
69
72
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '. '"
@@ -74,13 +77,10 @@ const orderedListRecipe = cva({
74
77
  counterReset: "level4 var(--start, 0)"
75
78
  },
76
79
  [LIST_ITEM]: {
77
- marginInlineStart: "4.5ch",
80
+ marginInlineStart: "calc(3ch + token(spacing.small))",
78
81
  counterIncrement: "level4",
79
82
  _before: {
80
83
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.' counter(level4, decimal) '. '"
81
- },
82
- [LETTER_LIST_ITEM]: {
83
- marginInlineStart: "0.5ch"
84
84
  }
85
85
  }
86
86
  }
@@ -95,6 +95,10 @@ const orderedListRecipe = cva({
95
95
  "&[data-count='true']": {
96
96
  counterReset: "level1 var(--start, 0)"
97
97
  },
98
+ [LETTER_LIST]: {
99
+ marginInlineStart: "0",
100
+ paddingInlineStart: "0"
101
+ },
98
102
  [LIST_ITEM]: {
99
103
  counterIncrement: "level1",
100
104
  _before: {
@@ -129,6 +133,7 @@ export const OrderedList = /*#__PURE__*/forwardRef((_ref, ref) => {
129
133
  "--start": start ? start - 1 : undefined
130
134
  }), [start]);
131
135
  return /*#__PURE__*/_jsx(StyledOrderedList, {
136
+ "data-embed-type": "ordered-list",
132
137
  "data-variant": variant,
133
138
  "data-count": start !== undefined,
134
139
  css: css.raw(orderedListRecipe.raw({
@@ -142,9 +147,14 @@ export const OrderedList = /*#__PURE__*/forwardRef((_ref, ref) => {
142
147
  export const UnOrderedList = styled("ul", {
143
148
  base: {
144
149
  listStyle: "revert",
145
- paddingInlineStart: "3ch",
150
+ marginInlineStart: "medium",
151
+ paddingInlineStart: "small",
152
+ "& ul": {
153
+ marginInlineStart: "0"
154
+ },
146
155
  "& li": {
147
156
  marginBlock: "small",
157
+ paddingInlineStart: "small",
148
158
  _marker: {
149
159
  color: "icon.strong"
150
160
  }
@@ -6,9 +6,11 @@
6
6
  *
7
7
  */
8
8
 
9
+ import { forwardRef } from "react";
9
10
  import { ark } from "@ark-ui/react";
10
11
  import { styled } from "@ndla/styled-system/jsx";
11
- export const ExpandableBox = styled("details", {
12
+ import { jsx as _jsx } from "react/jsx-runtime";
13
+ const StyledExpandableBox = styled(ark.details, {
12
14
  base: {
13
15
  transitionDuration: "fast",
14
16
  width: "100%",
@@ -20,13 +22,20 @@ export const ExpandableBox = styled("details", {
20
22
  clear: "both",
21
23
  _open: {
22
24
  padding: "medium",
23
- "& summary": {
25
+ "& summary, [data-embed-type='expandable-box-summary']": {
24
26
  marginBlockEnd: "-xxsmall"
25
27
  }
26
28
  }
27
29
  }
30
+ }, {
31
+ baseComponent: true
28
32
  });
29
- export const ExpandableBoxSummary = styled(ark.summary, {
33
+ export const ExpandableBox = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/_jsx(StyledExpandableBox, {
34
+ ...props,
35
+ "data-embed-type": "expandable-box",
36
+ ref: ref
37
+ }));
38
+ const StyledExpandableBoxSummary = styled(ark.summary, {
30
39
  base: {
31
40
  cursor: "pointer",
32
41
  margin: "-medium",
@@ -42,4 +51,9 @@ export const ExpandableBoxSummary = styled(ark.summary, {
42
51
  }
43
52
  }, {
44
53
  baseComponent: true
45
- });
54
+ });
55
+ export const ExpandableBoxSummary = /*#__PURE__*/forwardRef((props, ref) => /*#__PURE__*/_jsx(StyledExpandableBoxSummary, {
56
+ ...props,
57
+ "data-embed-type": "expandable-box-summary",
58
+ ref: ref
59
+ }));
@@ -10,6 +10,10 @@ import { JsxStyleProps, RecipeVariantProps } from "@ndla/styled-system/types";
10
10
  declare const orderedListRecipe: import("@ndla/styled-system/types").RecipeRuntimeFn<{
11
11
  variant: {
12
12
  numbers: {
13
+ "& > ol:not([data-variant='letters'])": {
14
+ marginInlineStart: "0";
15
+ paddingInlineStart: "0";
16
+ };
13
17
  counterReset: "level1";
14
18
  "&[data-count='true']": {
15
19
  counterReset: "level1 var(--start, 0)";
@@ -25,7 +29,7 @@ declare const orderedListRecipe: import("@ndla/styled-system/types").RecipeRunti
25
29
  counterReset: "level2 var(--start, 0)";
26
30
  };
27
31
  "& > li": {
28
- marginInlineStart: "1ch";
32
+ marginInlineStart: "small";
29
33
  counterIncrement: "level2";
30
34
  _before: {
31
35
  content: "counter(level1, decimal) '.' counter(level2, decimal) '. '";
@@ -36,7 +40,7 @@ declare const orderedListRecipe: import("@ndla/styled-system/types").RecipeRunti
36
40
  counterReset: "level3 var(--start, 0)";
37
41
  };
38
42
  "& > li": {
39
- marginInlineStart: "2.5ch";
43
+ marginInlineStart: "calc(1.5ch + token(spacing.small))";
40
44
  counterIncrement: "level3";
41
45
  _before: {
42
46
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '. '";
@@ -47,14 +51,11 @@ declare const orderedListRecipe: import("@ndla/styled-system/types").RecipeRunti
47
51
  counterReset: "level4 var(--start, 0)";
48
52
  };
49
53
  "& > li": {
50
- marginInlineStart: "4.5ch";
54
+ marginInlineStart: "calc(3ch + token(spacing.small))";
51
55
  counterIncrement: "level4";
52
56
  _before: {
53
57
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.' counter(level4, decimal) '. '";
54
58
  };
55
- "& > ol[data-variant='letters'] > li": {
56
- marginInlineStart: "0.5ch";
57
- };
58
59
  };
59
60
  };
60
61
  };
@@ -68,6 +69,10 @@ declare const orderedListRecipe: import("@ndla/styled-system/types").RecipeRunti
68
69
  "&[data-count='true']": {
69
70
  counterReset: "level1 var(--start, 0)";
70
71
  };
72
+ "& > ol[data-variant='letters']": {
73
+ marginInlineStart: "0";
74
+ paddingInlineStart: "0";
75
+ };
71
76
  "& > li": {
72
77
  counterIncrement: "level1";
73
78
  _before: {
@@ -23,18 +23,17 @@ const NUMBER_LIST = "& > ol:not([data-variant='letters'])";
23
23
  const LETTER_LIST_ITEM = `${LETTER_LIST} > li`;
24
24
  const orderedListRecipe = (0, _css.cva)({
25
25
  base: {
26
+ marginInlineStart: "small",
27
+ paddingInlineStart: "small",
26
28
  [LIST_ITEM]: {
27
- marginBlock: "small",
28
29
  _before: {
29
30
  position: "absolute",
30
- transform: "translateX(-100%)",
31
- paddingInlineEnd: "0.25ch",
31
+ transform: "translateX(calc(-100% + (token(spacing.small) * -1)))",
32
32
  fontVariantNumeric: "tabular-nums"
33
33
  }
34
34
  },
35
- marginInlineStart: "3ch",
36
- "& > li > ol": {
37
- marginInlineStart: "2.5ch"
35
+ "& li": {
36
+ marginBlock: "small"
38
37
  }
39
38
  },
40
39
  defaultVariants: {
@@ -43,6 +42,10 @@ const orderedListRecipe = (0, _css.cva)({
43
42
  variants: {
44
43
  variant: {
45
44
  numbers: {
45
+ [NUMBER_LIST]: {
46
+ marginInlineStart: "0",
47
+ paddingInlineStart: "0"
48
+ },
46
49
  counterReset: "level1",
47
50
  "&[data-count='true']": {
48
51
  counterReset: "level1 var(--start, 0)"
@@ -58,7 +61,7 @@ const orderedListRecipe = (0, _css.cva)({
58
61
  counterReset: "level2 var(--start, 0)"
59
62
  },
60
63
  [LIST_ITEM]: {
61
- marginInlineStart: "1ch",
64
+ marginInlineStart: "small",
62
65
  counterIncrement: "level2",
63
66
  _before: {
64
67
  content: "counter(level1, decimal) '.' counter(level2, decimal) '. '"
@@ -69,7 +72,7 @@ const orderedListRecipe = (0, _css.cva)({
69
72
  counterReset: "level3 var(--start, 0)"
70
73
  },
71
74
  [LIST_ITEM]: {
72
- marginInlineStart: "2.5ch",
75
+ marginInlineStart: "calc(1.5ch + token(spacing.small))",
73
76
  counterIncrement: "level3",
74
77
  _before: {
75
78
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '. '"
@@ -80,13 +83,10 @@ const orderedListRecipe = (0, _css.cva)({
80
83
  counterReset: "level4 var(--start, 0)"
81
84
  },
82
85
  [LIST_ITEM]: {
83
- marginInlineStart: "4.5ch",
86
+ marginInlineStart: "calc(3ch + token(spacing.small))",
84
87
  counterIncrement: "level4",
85
88
  _before: {
86
89
  content: "counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.' counter(level4, decimal) '. '"
87
- },
88
- [LETTER_LIST_ITEM]: {
89
- marginInlineStart: "0.5ch"
90
90
  }
91
91
  }
92
92
  }
@@ -101,6 +101,10 @@ const orderedListRecipe = (0, _css.cva)({
101
101
  "&[data-count='true']": {
102
102
  counterReset: "level1 var(--start, 0)"
103
103
  },
104
+ [LETTER_LIST]: {
105
+ marginInlineStart: "0",
106
+ paddingInlineStart: "0"
107
+ },
104
108
  [LIST_ITEM]: {
105
109
  counterIncrement: "level1",
106
110
  _before: {
@@ -135,6 +139,7 @@ const OrderedList = exports.OrderedList = /*#__PURE__*/(0, _react.forwardRef)((_
135
139
  "--start": start ? start - 1 : undefined
136
140
  }), [start]);
137
141
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledOrderedList, {
142
+ "data-embed-type": "ordered-list",
138
143
  "data-variant": variant,
139
144
  "data-count": start !== undefined,
140
145
  css: _css.css.raw(orderedListRecipe.raw({
@@ -148,9 +153,14 @@ const OrderedList = exports.OrderedList = /*#__PURE__*/(0, _react.forwardRef)((_
148
153
  const UnOrderedList = exports.UnOrderedList = (0, _jsx2.styled)("ul", {
149
154
  base: {
150
155
  listStyle: "revert",
151
- paddingInlineStart: "3ch",
156
+ marginInlineStart: "medium",
157
+ paddingInlineStart: "small",
158
+ "& ul": {
159
+ marginInlineStart: "0"
160
+ },
152
161
  "& li": {
153
162
  marginBlock: "small",
163
+ paddingInlineStart: "small",
154
164
  _marker: {
155
165
  color: "icon.strong"
156
166
  }
@@ -8,8 +8,10 @@
8
8
  import { HTMLArkProps } from "@ark-ui/react";
9
9
  import { JsxStyleProps } from "@ndla/styled-system/types";
10
10
  export type ExpandableBoxProps = HTMLArkProps<"details"> & JsxStyleProps;
11
- export declare const ExpandableBox: import("@ndla/styled-system/types").StyledComponent<"details", {}>;
11
+ export declare const ExpandableBox: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").DetailsHTMLAttributes<HTMLDetailsElement>, HTMLDetailsElement>, "ref"> & import("@ark-ui/react").PolymorphicProps & {
12
+ consumeCss?: boolean | undefined;
13
+ } & import("@ndla/styled-system/types").WithCss & import("react").RefAttributes<HTMLDetailsElement>>;
12
14
  export type ExpandableBoxSummaryProps = HTMLArkProps<"summary"> & JsxStyleProps;
13
- export declare const ExpandableBoxSummary: import("@ndla/styled-system/types").StyledComponent<import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, "ref"> & {
14
- ref?: ((instance: HTMLElement | null) => void) | import("react").RefObject<HTMLElement> | null | undefined;
15
- } & import("@ark-ui/react").PolymorphicProps>, {}>;
15
+ export declare const ExpandableBoxSummary: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLElement>, HTMLElement>, "ref"> & import("@ark-ui/react").PolymorphicProps & {
16
+ consumeCss?: boolean | undefined;
17
+ } & import("@ndla/styled-system/types").WithCss & import("react").RefAttributes<HTMLElement>>;
@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.ExpandableBoxSummary = exports.ExpandableBox = void 0;
7
- var _react = require("@ark-ui/react");
8
- var _jsx = require("@ndla/styled-system/jsx");
7
+ var _react = require("react");
8
+ var _react2 = require("@ark-ui/react");
9
+ var _jsx2 = require("@ndla/styled-system/jsx");
10
+ var _jsxRuntime = require("react/jsx-runtime");
9
11
  /**
10
12
  * Copyright (c) 2024-present, NDLA.
11
13
  *
@@ -14,7 +16,7 @@ var _jsx = require("@ndla/styled-system/jsx");
14
16
  *
15
17
  */
16
18
 
17
- const ExpandableBox = exports.ExpandableBox = (0, _jsx.styled)("details", {
19
+ const StyledExpandableBox = (0, _jsx2.styled)(_react2.ark.details, {
18
20
  base: {
19
21
  transitionDuration: "fast",
20
22
  width: "100%",
@@ -26,13 +28,20 @@ const ExpandableBox = exports.ExpandableBox = (0, _jsx.styled)("details", {
26
28
  clear: "both",
27
29
  _open: {
28
30
  padding: "medium",
29
- "& summary": {
31
+ "& summary, [data-embed-type='expandable-box-summary']": {
30
32
  marginBlockEnd: "-xxsmall"
31
33
  }
32
34
  }
33
35
  }
36
+ }, {
37
+ baseComponent: true
34
38
  });
35
- const ExpandableBoxSummary = exports.ExpandableBoxSummary = (0, _jsx.styled)(_react.ark.summary, {
39
+ const ExpandableBox = exports.ExpandableBox = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledExpandableBox, {
40
+ ...props,
41
+ "data-embed-type": "expandable-box",
42
+ ref: ref
43
+ }));
44
+ const StyledExpandableBoxSummary = (0, _jsx2.styled)(_react2.ark.summary, {
36
45
  base: {
37
46
  cursor: "pointer",
38
47
  margin: "-medium",
@@ -48,4 +57,9 @@ const ExpandableBoxSummary = exports.ExpandableBoxSummary = (0, _jsx.styled)(_re
48
57
  }
49
58
  }, {
50
59
  baseComponent: true
51
- });
60
+ });
61
+ const ExpandableBoxSummary = exports.ExpandableBoxSummary = /*#__PURE__*/(0, _react.forwardRef)((props, ref) => /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledExpandableBoxSummary, {
62
+ ...props,
63
+ "data-embed-type": "expandable-box-summary",
64
+ ref: ref
65
+ }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ndla/primitives",
3
- "version": "1.0.43-alpha.0",
3
+ "version": "1.0.44-alpha.0",
4
4
  "description": "Primitive components for NDLA.",
5
5
  "license": "GPL-3.0",
6
6
  "main": "lib/index.js",
@@ -29,11 +29,11 @@
29
29
  ],
30
30
  "dependencies": {
31
31
  "@ark-ui/react": "^4.1.1",
32
- "@ndla/styled-system": "^0.0.23",
32
+ "@ndla/styled-system": "^0.0.24",
33
33
  "@ndla/util": "^5.0.0-alpha.0"
34
34
  },
35
35
  "devDependencies": {
36
- "@ndla/preset-panda": "^0.0.38",
36
+ "@ndla/preset-panda": "^0.0.39",
37
37
  "@pandacss/dev": "^0.46.0"
38
38
  },
39
39
  "peerDependencies": {
@@ -43,5 +43,5 @@
43
43
  "publishConfig": {
44
44
  "access": "public"
45
45
  },
46
- "gitHead": "58ee18eab14c58d6e75fb4074f7a1f39dd538957"
46
+ "gitHead": "98f727d2e22b4030ec61672a8f843b2d0d0ef278"
47
47
  }