Skip to content

Commit dfa0367

Browse files
JosefBredereckJosefBredereck
authored
BREAKING-CHANGE: Deprecate ordering by file-prefix ##- (pattern-lab#1252)
* Remove pattern ordering by file prefix ##- * pattern-lab#1252: Remove unused code * pattern-lab#1252 Update pattern doc locations * pattern-lab#1252 add possibility to disable deprecation warning * pattern-lab#1252 Fix dev engine twig
1 parent ff52a92 commit dfa0367

File tree

9 files changed

+50
-48
lines changed

9 files changed

+50
-48
lines changed

‎packages/uikit-workshop/src/html/partials/base-template.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<ul class="pl-c-breadcrumb">
1111
{{# patternBreadcrumb }}
1212

13-
<li class="pl-c-breadcrumb__item">{{ patternType }}</li>
13+
<li class="pl-c-breadcrumb__item">{{ patternGroup }}</li>
1414

15-
{{# patternSubtype }}
16-
<li class="pl-c-breadcrumb__item">{{ patternSubtype }}</li>
17-
{{/ patternSubtype }} {{/ patternBreadcrumb }}
15+
{{# patternSubgroup }}
16+
<li class="pl-c-breadcrumb__item">{{ patternSubgroup }}</li>
17+
{{/ patternSubgroup }} {{/ patternBreadcrumb }}
1818
</ul>
1919
<!--end pl-c-breadcrumb-->
2020

‎packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,33 +245,33 @@ class Nav extends BaseComponent {
245245
}
246246

247247
render({ layoutMode }) {
248-
const patternTypes = window.navItems.patternTypes;
248+
const patternGroups = window.navItems.patternGroups;
249249

250250
return (
251251
<ol class="pl-c-nav__list pl-js-pattern-nav-target">
252-
{patternTypes.map((item, i) => {
252+
{patternGroups.map((item, i) => {
253253
const patternItems = item.patternItems;
254254

255255
return (
256-
<NavItem className={`pl-c-nav__item--${item.patternTypeLC}`}>
256+
<NavItem className={`pl-c-nav__item--${item.patternGroupLC}`}>
257257
<NavTitle
258-
aria-controls={item.patternTypeLC}
258+
aria-controls={item.patternGroupLC}
259259
onClick={this.toggleNavPanel}
260260
>
261-
{item.patternTypeUC}
261+
{item.patternGroupUC}
262262
</NavTitle>
263263
<ol
264-
id={item.patternSubtypeUC}
264+
id={item.patternSubgroupUC}
265265
className={`pl-c-nav__sublist pl-c-nav__sublist--dropdown pl-js-acc-panel`}
266266
>
267-
{item.patternTypeItems.map((patternSubtype, i) => {
267+
{item.patternGroupItems.map((patternSubgroup, i) => {
268268
return (
269269
<NavList
270270
elem={this.elem}
271-
category={patternSubtype.patternSubtypeLC}
272-
categoryName={patternSubtype.patternSubtypeUC}
271+
category={patternSubgroup.patternSubgroupLC}
272+
categoryName={patternSubgroup.patternSubgroupUC}
273273
>
274-
{patternSubtype.patternSubtypeItems}
274+
{patternSubgroup.patternSubgroupItems}
275275
</NavList>
276276
);
277277
})}

‎packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ export const NavList = props => {
2222
return (
2323
<NavItem className={`pl-c-nav__item--${category.toLowerCase()}`}>
2424
{viewAllItems.length > 0 ? (
25-
viewAllItems.map(patternSubtypeItem => (
25+
viewAllItems.map(patternSubgroupItem => (
2626
<div class="pl-c-nav__link--overview-wrapper">
2727
<NavLink
2828
category={category}
2929
categoryName={categoryName}
30-
item={patternSubtypeItem}
30+
item={patternSubgroupItem}
3131
elem={elem}
3232
/>
3333

@@ -53,12 +53,12 @@ export const NavList = props => {
5353
id={category}
5454
className={`pl-c-nav__subsublist pl-c-nav__subsublist--dropdown pl-js-acc-panel`}
5555
>
56-
{nonViewAllItems.map(patternSubtypeItem => (
56+
{nonViewAllItems.map(patternSubgroupItem => (
5757
<NavItem>
5858
<NavLink
5959
category={category}
6060
categoryName={categoryName}
61-
item={patternSubtypeItem}
61+
item={patternSubgroupItem}
6262
elem={elem}
6363
/>
6464
</NavItem>

‎packages/uikit-workshop/src/scripts/components/pl-search/pl-search.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ class Search extends BaseComponent {
4545
super.connecting && super.connecting();
4646

4747
this.items = [];
48-
for (const patternType in window.patternPaths) {
49-
if (window.patternPaths.hasOwnProperty(patternType)) {
50-
for (const pattern in window.patternPaths[patternType]) {
51-
if (window.patternPaths[patternType].hasOwnProperty(pattern)) {
48+
for (const patternGroup in window.patternPaths) {
49+
if (window.patternPaths.hasOwnProperty(patternGroup)) {
50+
for (const pattern in window.patternPaths[patternGroup]) {
51+
if (window.patternPaths[patternGroup].hasOwnProperty(pattern)) {
5252
const obj = {};
53-
obj.label = patternType + '-' + pattern;
54-
obj.id = window.patternPaths[patternType][pattern];
53+
obj.label = patternGroup + '-' + pattern;
54+
obj.id = window.patternPaths[patternGroup][pattern];
5555
this.items.push(obj);
5656
}
5757
}

‎packages/uikit-workshop/src/scripts/utils/url-handler.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ export const urlHandler = {
5353

5454
// look at this as a regular pattern
5555
const bits = this.getPatternInfo(nameClean, paths);
56-
const patternType = bits[0];
56+
const patternGroup = bits[0];
5757
const pattern = bits[1];
5858

5959
if (
60-
paths[patternType] !== undefined &&
61-
paths[patternType][pattern] !== undefined
60+
paths[patternGroup] !== undefined &&
61+
paths[patternGroup][pattern] !== undefined
6262
) {
63-
fileName = paths[patternType][pattern];
64-
} else if (paths[patternType] !== undefined) {
65-
for (const patternMatchKey in paths[patternType]) {
63+
fileName = paths[patternGroup][pattern];
64+
} else if (paths[patternGroup] !== undefined) {
65+
for (const patternMatchKey in paths[patternGroup]) {
6666
if (patternMatchKey.indexOf(pattern) !== -1) {
67-
fileName = paths[patternType][patternMatchKey];
67+
fileName = paths[patternGroup][patternMatchKey];
6868
break;
6969
}
7070
}
@@ -114,15 +114,15 @@ export const urlHandler = {
114114
let i = 1;
115115
const c = patternBits.length;
116116

117-
let patternType = patternBits[0];
118-
while (paths[patternType] === undefined && i < c) {
119-
patternType += '-' + patternBits[i];
117+
let patternGroup = patternBits[0];
118+
while (paths[patternGroup] === undefined && i < c) {
119+
patternGroup += '-' + patternBits[i];
120120
i++;
121121
}
122122

123-
const pattern = name.slice(patternType.length + 1, name.length);
123+
const pattern = name.slice(patternGroup.length + 1, name.length);
124124

125-
return [patternType, pattern];
125+
return [patternGroup, pattern];
126126
},
127127

128128
/**

‎packages/uikit-workshop/views-twig/partials/patternSectionSubtype.twig renamed to ‎packages/uikit-workshop/views-twig/partials/patternSectionSubgroup.twig

File renamed without changes.

‎packages/uikit-workshop/views-twig/viewall.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<!-- Index of Patterns -->
44
<div class="pl-c-pattern-index">
55
{% for partial in partials %}
6-
{% if partial.patternSectionSubtype %}
7-
{% include "@uikit/patternSectionSubtype.twig" %}
6+
{% if partial.patternSectionSubgroup %}
7+
{% include "@uikit/patternSectionSubgroup.twig" %}
88
{% else %}
99
{% include "@uikit/patternSection.twig" %}
1010
{% endif %}

‎packages/uikit-workshop/views/partials/patternSectionSubtype.mustache renamed to ‎packages/uikit-workshop/views/partials/patternSectionSubgroup.mustache

File renamed without changes.

‎packages/uikit-workshop/views/viewall.mustache

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<!-- View All Patterns in a Pattern Sub-Type -->
22
<div class="pl-c-main">
3-
3+
44
<!-- Index of Patterns -->
55
<div class="pl-c-pattern-index">
6-
6+
77
{{# partials }}
8-
{{# patternSectionSubtype }}
9-
{{> patternSectionSubtype }}
10-
{{/ patternSectionSubtype }}
11-
{{^ patternSectionSubtype }}
12-
{{> patternSection }}
13-
{{/ patternSectionSubtype }}
8+
{{# patternSectionSubgroup }}
9+
{{> patternSectionSubgroup }}
10+
{{/ patternSectionSubgroup }}
11+
{{^ patternSectionSubgroup }}
12+
{{> patternSection }}
13+
{{/ patternSectionSubgroup }}
1414
{{/ partials }}
1515

16-
</div><!--end pl-c-pattern-index-->
16+
</div>
17+
<!--end pl-c-pattern-index-->
1718

18-
</div><!--end pl-c-main-->
19+
</div>
20+
<!--end pl-c-main-->

0 commit comments

Comments
 (0)