From d0672f65e7f35616621f9ebc7d703905b697a6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=20Pl=C3=B6tner?= Date: Fri, 7 Dec 2018 15:10:12 +0100 Subject: [PATCH] fix(patterns): find all patterns inlcuding pseudo patterns find all patterns including pseudo patterns and sort them after retrieving all patterns instead of inject them in the array working on fixes issue #975 --- packages/core/src/lib/addPattern.js | 7 +------ packages/core/src/lib/patternlab.js | 7 ++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/core/src/lib/addPattern.js b/packages/core/src/lib/addPattern.js index 6cc5e0266..af6886466 100644 --- a/packages/core/src/lib/addPattern.js +++ b/packages/core/src/lib/addPattern.js @@ -41,12 +41,7 @@ module.exports = function(pattern, patternlab) { patternlab.partials[pattern.patternPartial] = pattern.patternDesc; } - //patterns sorted by name so the patterntype and patternsubtype is adhered to for menu building - patternlab.patterns.splice( - _.sortedIndexBy(patternlab.patterns, pattern, 'name'), - 0, - pattern - ); + patternlab.patterns.push(pattern); patternlab.graph.add(pattern); } }; diff --git a/packages/core/src/lib/patternlab.js b/packages/core/src/lib/patternlab.js index 07d4f1d0d..2b8cc3d43 100644 --- a/packages/core/src/lib/patternlab.js +++ b/packages/core/src/lib/patternlab.js @@ -334,7 +334,12 @@ module.exports = class PatternLab { this.patterns.map(pattern => { return processIterative(pattern, self); }) - ); + ).then(() => { + // patterns sorted by name so the patterntype and patternsubtype is adhered to for menu building + this.patterns.sort((pattern1, pattern2) => + pattern1.name.localeCompare(pattern2.name) + ); + }); }); }