Merge branch 'master' into release

electric-eloquence · Jul 5, 2021 · 548c3bb · 548c3bb
2 parents 993a6fb + ff9a6a9
commit 548c3bb
Show file tree

Hide file tree

Showing 55 changed files with 2,375 additions and 914 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "he": "1.2.0",
     "jquery": "^3.5.1",
     "mousetrap": "1.6.5",
-    "prismjs": "1.23.0",
+    "prismjs": "1.24.0",
     "redux": "^4.0.5",
     "requerio": "^0.7.0",
     "typeahead.js": "0.10.5",
@@ -59,16 +59,16 @@
     "@babel/preset-env": "^7.11.5",
     "@babel/register": "^7.11.5",
     "@babel/runtime": "^7.11.2",
-    "@wdio/cli": "7.2.0",
-    "@wdio/local-runner": "7.2.0",
-    "@wdio/mocha-framework": "7.2.0",
-    "@wdio/spec-reporter": "7.2.0",
-    "@wdio/sync": "7.2.0",
+    "@wdio/cli": "7.7.3",
+    "@wdio/local-runner": "7.7.3",
+    "@wdio/mocha-framework": "7.7.3",
+    "@wdio/spec-reporter": "7.7.3",
+    "@wdio/sync": "7.7.3",
     "babel-eslint": "^10.1.0",
     "chai": "4.x",
     "chai-webdriverio": "^1.0.0",
     "cheerio": "^1.0.0-rc.3",
-    "chromedriver": "^89.0.0",
+    "chromedriver": "^91.0.0",
     "coveralls": "3.x",
     "eslint": "7.x",
     "fepper": "*",
@@ -78,7 +78,8 @@
     "nyc": "15.x",
     "rollup": "^2.21.0",
     "sinon": "9.x",
-    "wdio-chromedriver-service": "7.0.0",
-    "webdriverio": "7.2.0"
+    "wdio-chromedriver-service": "7.1.0",
+    "webdriverio": "7.7.3",
+    "xmldom": "^0.6.0"
   }
 }
diff --git a/patterns/00-elements-paragraph/00-elements-paragraph.html b/patterns/00-elements-paragraph/00-elements-paragraph.html
@@ -27,7 +27,7 @@
 <p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/00-elements/index.html b/patterns/00-elements/index.html
@@ -70,7 +70,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-elements-paragraph" class="sg-pattern-data">
-          {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[],"lineageExists":false,"lineageR":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Paragraph","patternPartial":"elements-paragraph","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/patterns/01-compounds-block/01-compounds-block.html b/patterns/01-compounds-block/01-compounds-block.html
@@ -27,7 +27,7 @@
 <p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"missingPartials":["organisms-molecules","molecules-atoms"],"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/01-compounds-block/01-compounds-block.mustache b/patterns/01-compounds-block/01-compounds-block.mustache
@@ -1 +1,3 @@
 {{> 00-elements/paragraph }}
+{{> organisms-molecules }}
+{{> molecules-atoms }}
diff --git a/patterns/01-compounds/index.html b/patterns/01-compounds/index.html
@@ -70,7 +70,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-compounds-block" class="sg-pattern-data">
-          {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"missingPartials":["organisms-molecules","molecules-atoms"],"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/patterns/02-components-region/02-components-region.html b/patterns/02-components-region/02-components-region.html
@@ -27,7 +27,7 @@
 <p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Region","patternPartial":"components-region","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Region","patternPartial":"components-region","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/02-components/index.html b/patterns/02-components/index.html
@@ -70,7 +70,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-components-region" class="sg-pattern-data">
-          {"lineage":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Region","patternPartial":"components-region","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[{"lineagePattern":"compounds-block","lineagePath":"patterns/01-compounds-block/01-compounds-block.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Region","patternPartial":"components-region","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/patterns/03-templates-page/03-templates-page.html b/patterns/03-templates-page/03-templates-page.html
@@ -27,7 +27,7 @@
 <p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"pages-homepage","lineagePath":"patterns/04-pages-00-homepage/04-pages-00-homepage.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Page","patternPartial":"templates-page","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"pages-homepage","lineagePath":"patterns/04-pages-00-homepage/04-pages-00-homepage.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Page","patternPartial":"templates-page","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/03-templates/index.html b/patterns/03-templates/index.html
@@ -70,7 +70,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-templates-page" class="sg-pattern-data">
-          {"lineage":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"pages-homepage","lineagePath":"patterns/04-pages-00-homepage/04-pages-00-homepage.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Page","patternPartial":"templates-page","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"pages-homepage","lineagePath":"patterns/04-pages-00-homepage/04-pages-00-homepage.html","isHidden":false}],"lineageRExists":true,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Page","patternPartial":"templates-page","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/patterns/04-pages-00-homepage/04-pages-00-homepage.html b/patterns/04-pages-00-homepage/04-pages-00-homepage.html
@@ -27,7 +27,7 @@
 <a href="../../patterns/02-components-region/02-components-region.html">Component</a>  <p>Fepper Base</p>  
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageExists":true,"lineageR":[],"lineageRExists":false,"patternDesc":"","patternExtension":".mustache","patternName":"Homepage","patternPartial":"pages-homepage","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageExists":true,"lineageR":[],"lineageRExists":false,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Homepage","patternPartial":"pages-homepage","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/04-pages/index.html b/patterns/04-pages/index.html
@@ -70,7 +70,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-pages-homepage" class="sg-pattern-data">
-          {"lineage":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageExists":true,"lineageR":[],"lineageRExists":false,"patternDesc":"","patternExtension":".mustache","patternName":"Homepage","patternPartial":"pages-homepage","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[{"lineagePattern":"templates-page","lineagePath":"patterns/03-templates-page/03-templates-page.html","isHidden":false}],"lineageExists":true,"lineageR":[],"lineageRExists":false,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Homepage","patternPartial":"pages-homepage","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/patterns/98-scrape-00-html-scraper/98-scrape-00-html-scraper.html b/patterns/98-scrape-00-html-scraper/98-scrape-00-html-scraper.html
@@ -28,7 +28,7 @@
 
 <!-- Begin Pattern Lab (Required for Pattern Lab to run properly) -->
 <script type="text/json" id="sg-pattern-data-footer" class="sg-pattern-data">
-  {"lineage":[],"lineageExists":false,"lineageR":[],"lineageRExists":false,"patternDesc":"","patternExtension":".mustache","patternName":"Html Scraper","patternPartial":"scrape-html-scraper","patternState":"","portReloader":35730,"portServer":3001}
+  {"lineage":[],"lineageExists":false,"lineageR":[],"lineageRExists":false,"missingPartials":[],"patternDesc":"","patternExtension":".mustache","patternName":"Html Scraper","patternPartial":"scrape-html-scraper","patternState":"","portReloader":35730,"portServer":3001}
 </script>
 
 <script>

diff --git a/patterns/viewall/viewall.html b/patterns/viewall/viewall.html
@@ -113,7 +113,7 @@ <h4 class="sg-pattern-title">
         </div>
         <div class="sg-pattern-example"></div>
         <script type="text/json" id="sg-pattern-data-compounds-block" class="sg-pattern-data">
-          {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
+          {"lineage":[{"lineagePattern":"elements-paragraph","lineagePath":"patterns/00-elements-paragraph/00-elements-paragraph.html","isHidden":false}],"lineageExists":true,"lineageR":[{"lineagePattern":"components-region","lineagePath":"patterns/02-components-region/02-components-region.html","isHidden":false}],"lineageRExists":true,"missingPartials":["organisms-molecules","molecules-atoms"],"patternDesc":"","patternExtension":".mustache","patternName":"Block","patternPartial":"compounds-block","patternState":"","portReloader":35730,"portServer":3001}
         </script>
       </div><!--end .sg-pattern-->
 

diff --git a/scripts/classes/annotations-viewer.js b/scripts/classes/annotations-viewer.js
@@ -16,39 +16,30 @@ export default class AnnotationsViewer {
       return;
     }
 
-    if (data.annotationsOverlay) { // This condition must come first.
-      if (data.annotationsOverlay === 'on') {
-        this.viewall = data.viewall || false;
+    // This condition must come first.
+    if (data.annotationsUpdate) {
+      this.updateAnnotations(data.annotations, data.patternPartial);
+    }
 
-        // Update code.
-        this.updateAnnotations(data.annotations, data.patternPartial);
+    if (data.annotationNumber) {
+      this.moveTo(data.annotationNumber);
+    }
+
+    if (data.annotationsViewallClick) {
+      if (data.annotationsViewallClick === 'on') {
+        this.openAnnotations();
       }
       else {
         this.closeAnnotations();
       }
     }
-    else if (data.annotationNumber) {
-      this.moveTo(data.annotationNumber);
-    }
-    else if (typeof data.annotationsViewall === 'boolean') {
-      this.viewall = data.annotationsViewall;
-    }
-    else if (data.annotationsViewallClick) {
-      this.openAnnotations();
-    }
 
     switch (data.event) {
       case 'patternlab.keyPress':
         switch (data.keyPress) {
           case 'ctrl+shift+a':
             this.toggleAnnotations();
 
-            // If viewall, scroll to the focused pattern.
-            /* istanbul ignore if */
-            if (this.viewall && this.annotationsActive) {
-              this.scrollViewall();
-            }
-
             break;
 
           case 'esc':
@@ -76,7 +67,7 @@ export default class AnnotationsViewer {
     this.annotationsActive = false;
     this.moveToNumber = 0;
     this.$orgs = fepperUi.requerio.$orgs;
-    this.viewall = false;
+    this.viewall = false; // DEPRECATED.
   }
 
   /* GETTERS for fepperUi instance props in case they are undefined at instantiation. */
@@ -118,11 +109,10 @@ export default class AnnotationsViewer {
   }
 
   closeAnnotations() {
-    const obj = {annotationsToggle: 'off'};
     this.annotationsActive = false;
 
     this.viewerHandler.closeViewer();
-    this.$orgs['#sg-viewport'][0].contentWindow.postMessage(obj, this.uiProps.targetOrigin);
+    this.$orgs['#sg-viewport'][0].contentWindow.postMessage({annotationsToggle: 'off'}, this.uiProps.targetOrigin);
     this.$orgs['#sg-t-annotations'].dispatchAction('removeClass', 'active');
     this.$orgs['#sg-annotations-container'].dispatchAction('removeClass', 'active');
   }
@@ -145,28 +135,33 @@ export default class AnnotationsViewer {
   }
 
   openAnnotations() {
-    // Tell the pattern that annotations viewer has been turned on.
-    const objAnnotationsToggle = {annotationsToggle: 'on'};
-    // Flag that viewer is active.
+    // Flag that the viewer is active.
     this.annotationsActive = true;
 
     // Make sure the code viewer is off before showing annotations.
     this.codeViewer.closeCode();
-    this.viewerHandler.openViewer();
-    this.$orgs['#sg-viewport'][0].contentWindow.postMessage(objAnnotationsToggle, this.uiProps.targetOrigin);
+    // Tell the pattern that the annotations viewer has been turned on.
+    this.$orgs['#sg-viewport'][0].contentWindow.postMessage({annotationsToggle: 'on'}, this.uiProps.targetOrigin);
     this.$orgs['#sg-t-annotations'].dispatchAction('addClass', 'active');
     this.$orgs['#sg-annotations-container'].dispatchAction('addClass', 'active');
+    this.viewerHandler.openViewer();
 
     if (this.moveToNumber !== 0) {
       this.moveTo(this.moveToNumber);
 
-      // Only unset this.moveToNumber if annotations html has been loaded.
+      // Only unset this.moveToNumber if the annotations html has been loaded.
       if (this.$orgs['#sg-annotations'].getState().html) {
         this.moveToNumber = 0;
       }
     }
-  }
 
+    // If viewall, scroll to the focused pattern.
+    /* istanbul ignore if */
+    if (this.uiProps.viewall) {
+      this.viewall = this.uiProps.viewall; // DEPRECATED.
+      this.scrollViewall();
+    }
+  }
 
   scrollViewall() /* istanbul ignore next */ {
     this.$orgs['#sg-viewport'][0].contentWindow
@@ -211,13 +206,20 @@ export default class AnnotationsViewer {
 </div>`;
       }
 
-      this.$orgs['#sg-annotations'].dispatchAction('html', html);
+      this.$orgs['#sg-annotations-na'].dispatchAction('css', {display: 'none'});
+      this.$orgs['#sg-annotations']
+        .dispatchAction('html', html)
+        .dispatchAction('css', {display: 'block'});
 
       if (this.annotationsActive && this.moveToNumber !== 0) {
         this.moveTo(this.moveToNumber);
 
         this.moveToNumber = 0;
       }
     }
+    else {
+      this.$orgs['#sg-annotations-na'].dispatchAction('css', {display: 'block'});
+      this.$orgs['#sg-annotations'].dispatchAction('css', {display: 'none'});
+    }
   }
 }