@jinntec/fore 1.0.0-4 → 1.0.0-5

package/index.js

@@ -40,3 +40,5 @@ import './src/actions/fx-show.js';
 import './src/actions/fx-hide.js';
 
 import './src/functions/fx-function.js';
+
+// import '@teipublisher/pb-components/src/pb-components-bundle.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jinntec/fore",
-  "version": "1.0.0-4",
+  "version": "1.0.0-5",
   "description": "Fore - Forms for the Web",
   "module": "./index.js",
   "publishConfig": {
@@ -19,13 +19,15 @@
   },
   "files": [
     "index.js",
-    "resources/fore-styles.css",
+    "resources/fore.css",
+    "resources/vars.css",
+    "resources/toastify.css",
     "src/**/*",
     "dist/fore-all.js",
     "dist/fore-debug.js"
   ],
   "dependencies": {
-    "@jinntec/jinn-toast": "^1.0.2",
+    "@jinntec/jinn-toast": "^1.0.3",
     "@polymer/iron-component-page": "^4.0.1",
     "@polymer/iron-demo-helpers": "^3.1.0",
     "@polymer/paper-button": "^3.0.1",

package/resources/fore.css

@@ -0,0 +1,213 @@
+@import 'toastify.css';
+@import 'vars.css';
+
+html{
+    --inspector-bg:var(--paper-grey-500);
+    --inspector-pre-bg:var(--paper-grey-100);
+    --inspector-color:var(--paper-grey-800);
+    --inspector-instance-height:200px;
+}
+[unresolved]{
+    display: none;
+}
+[disabled] {
+    pointer-events: none;
+    cursor: default;
+}
+fx-fore{
+    opacity: 0;
+}
+fx-fore.fx-ready{
+    opacity: 1;
+}
+fx-group, fx-switch, fx-repeat, fx-dialog{
+    display: block;
+}
+fx-trigger a[disabled] {
+    color:lightgrey;
+}
+fx-trigger img[disabled]{
+    filter:blur(2px);
+}
+
+.error{
+    background: var(--paper-red-500);
+}
+fx-alert{
+    color:darkred;
+    font-size: 0.9rem;
+}
+
+fx-model, fx-model *, fx-model ::slotted(fx-instance), fx-instance{
+    display:none;
+}
+
+fx-control, fx-trigger{
+    white-space: nowrap;
+    position: relative;
+}
+.fx-checkbox{
+    white-space: nowrap;
+}
+fx-hint{
+    display: none;
+}
+fx-repeatitem{
+    position:relative;
+    /*
+    opacity:1;
+    -webkit-transition: opacity 3s;
+    -moz-transition: opacity 3s;
+    transition: opacity 3s;
+    */
+}
+.hidden {
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0s 2s, opacity 2s linear;
+}
+
+/* fx-inspector styles */
+fx-inspector{
+    position:fixed;
+    left:0;
+    right:0;
+    bottom:0;
+    width: 100%;
+    background: var(--inspector-bg);
+    color: white;
+    max-height: 33%;
+    overflow: scroll;
+    border-top:3px solid black;
+    opacity: 0.9;
+}
+fx-inspector::before{
+    content:'Instance Inspector';
+    font-style:italic;
+    position:absolute;
+    top:0;
+    right: 0.3rem;
+    z-index: 10;
+    font-size: 0.8rem;
+}
+fx-inspector details{
+    padding: 1rem;
+}
+fx-inspector pre{
+    background: var(--inspector-pre-bg);
+    border-radius: 0.5rem;
+    padding: 0.3rem;
+    max-height: var(--inspector-instance-height);
+    /*overflow: scroll;*/
+}
+fx-inspector details{
+    overflow: auto;
+    margin:0;
+}
+fx-inspector summary{
+    padding: 0;
+}
+
+/* ### FX-DIALOG STYLES ### */
+/* ### FX-DIALOG STYLES ### */
+/* ### FX-DIALOG STYLES ### */
+fx-dialog{
+    display: none;
+    opacity: 0;
+    transition: opacity 1s linear;
+}
+fx-dialog.show{
+    display: block;
+    min-height: 200px;
+    border-radius: 0.5rem;
+    opacity: 1;
+    background:rgba(0,0,0,0.5);
+    z-index: 10;
+    transition: opacity 2s linear;
+}
+
+fx-dialog.show .dialog-content{
+    padding: 1rem;
+    width:fit-content;
+    height:fit-content;
+    border:thin solid;
+    border-radius: 0.3rem;
+    position: absolute;
+    left:50%;
+    top:50%;
+    transform:translateX(-50%) translateY(-50%);
+    background: white;
+
+}
+fx-dialog a.close-dialog{
+    position: absolute;
+    right: 0.4rem;
+    top:0.2rem;
+    color:var(--paper-grey-900);
+    text-decoration: none;
+    font-size:1.2rem;
+}
+fx-dialog .action{
+    width: 100%;
+    text-align: center;
+    display: block;
+}
+
+
+
+/*
+.visible {
+    visibility: visible;
+    opacity: 1;
+    transition: opacity 2s linear;
+}
+*/
+
+.required:after {
+    content: '*';
+    color: red;
+    padding-left: 4px;
+    right:3px;
+    top:3px;
+    z-index: 1;
+}
+
+[required]:after {
+    content: "*";
+    display: inline;
+    color: red;
+}
+.logtree details{
+    padding:0.1rem 1rem;
+    margin:0;
+}
+.logtree details summary{
+
+}
+.non-relevant{
+    opacity: 0;
+    height: 0;
+    transition: opacity 1s;
+}
+.vertical label{
+    display: block;
+}
+[refresh-on-view]{
+    /*opacity: 0;*/
+}
+.loaded{
+    animation: fadein 0.3s forwards;
+}
+/* avoid flicker from nested lazily loaded elements */
+.loaded .loaded{
+    animation: none;
+    opacity: 1;
+}
+@keyframes fadein {
+    0% {
+        opacity:0;
+    }
+    100% {
+        opacity:1;
+    }
+}

package/resources/toastify.css

@@ -0,0 +1,87 @@
+/*!
+ * Toastify js 1.11.0
+ * https://github.com/apvarun/toastify-js
+ * @license MIT licensed
+ *
+ * Copyright (C) 2018 Varun A P
+ */
+
+.toastify {
+    padding: 12px 20px;
+    color: #ffffff;
+    display: inline-block;
+    box-shadow: 0 3px 6px -1px rgba(0, 0, 0, 0.12), 0 10px 36px -4px rgba(77, 96, 232, 0.3);
+    background: -webkit-linear-gradient(315deg, #73a5ff, #5477f5);
+    background: linear-gradient(135deg, #f8f8f9, #cfcfcf);
+    position: fixed;
+    opacity: 0;
+    transition: all 0.4s cubic-bezier(0.215, 0.61, 0.355, 1);
+    border-radius: 2px;
+    cursor: pointer;
+    text-decoration: none;
+    max-width: calc(50% - 20px);
+    z-index: 2147483647;
+    font-weight: 300;
+    color:black;
+}
+
+.toastify.on {
+    opacity: 1;
+}
+
+.toast-close {
+    opacity: 0.8;
+    padding: 0 5px;
+}
+
+.toastify-right {
+    right: 15px;
+}
+.toastify-right .toast-close {
+  margin-right:-10px;
+}
+
+.toastify-left {
+    left: 15px;
+}
+.toastify-left .toast-close{
+  margin-left:-10px;
+}
+
+.toastify-top {
+    top: -150px;
+}
+
+.toastify-bottom {
+    bottom: -150px;
+}
+
+.toastify-rounded {
+    border-radius: 25px;
+}
+
+.toastify-avatar {
+    width: 1.5em;
+    height: 1.5em;
+    margin: -7px 5px;
+    border-radius: 2px;
+}
+
+.toastify-center {
+    margin-left: auto;
+    margin-right: auto;
+    left: 0;
+    right: 0;
+    max-width: fit-content;
+    max-width: -moz-fit-content;
+}
+
+@media only screen and (max-width: 360px) {
+    .toastify-right, .toastify-left {
+        margin-left: auto;
+        margin-right: auto;
+        left: 0;
+        right: 0;
+        max-width: fit-content;
+    }
+}

package/resources/{fore-styles.css → vars.css}

@@ -1,15 +1,5 @@
 /* Material Design color palette for Google products */
-/* Material Design color palette for Google products */
-/* Material Design color palette for Google products */
-/* Material Design color palette for Google products */
-
 html {
-
-    --inspector-bg:var(--paper-grey-500);
-    --inspector-pre-bg:var(--paper-grey-100);
-    --inspector-color:var(--paper-grey-800);
-    --inspector-instance-height:200px;
-
     --google-red-100: #f4c7c3;
     --google-red-300: #e67c73;
     --google-red-500: #db4437;
@@ -328,285 +318,3 @@ html {
     --model-element-margin:10px;
 }
 
-/*!
- * Toastify js 1.11.0
- * https://github.com/apvarun/toastify-js
- * @license MIT licensed
- *
- * Copyright (C) 2018 Varun A P
- */
-
-.toastify {
-    padding: 12px 20px;
-    color: #ffffff;
-    display: inline-block;
-    box-shadow: 0 3px 6px -1px rgba(0, 0, 0, 0.12), 0 10px 36px -4px rgba(77, 96, 232, 0.3);
-    background: -webkit-linear-gradient(315deg, #73a5ff, #5477f5);
-    background: linear-gradient(135deg, #f8f8f9, #cfcfcf);
-    position: fixed;
-    opacity: 0;
-    transition: all 0.4s cubic-bezier(0.215, 0.61, 0.355, 1);
-    border-radius: 2px;
-    cursor: pointer;
-    text-decoration: none;
-    max-width: calc(50% - 20px);
-    z-index: 2147483647;
-    font-weight: 300;
-    color:black;
-}
-
-.toastify.on {
-    opacity: 1;
-}
-
-.toast-close {
-    opacity: 0.8;
-    padding: 0 5px;
-}
-
-.toastify-right {
-    right: 15px;
-}
-.toastify-right .toast-close {
-    margin-right:-10px;
-}
-
-.toastify-left {
-    left: 15px;
-}
-.toastify-left .toast-close{
-    margin-left:-10px;
-}
-
-.toastify-top {
-    top: -150px;
-}
-
-.toastify-bottom {
-    bottom: -150px;
-}
-
-.toastify-rounded {
-    border-radius: 25px;
-}
-
-.toastify-avatar {
-    width: 1.5em;
-    height: 1.5em;
-    margin: -7px 5px;
-    border-radius: 2px;
-}
-
-.toastify-center {
-    margin-left: auto;
-    margin-right: auto;
-    left: 0;
-    right: 0;
-    max-width: fit-content;
-    max-width: -moz-fit-content;
-}
-
-@media only screen and (max-width: 360px) {
-    .toastify-right, .toastify-left {
-        margin-left: auto;
-        margin-right: auto;
-        left: 0;
-        right: 0;
-        max-width: fit-content;
-    }
-}
-
-/*!
- * Fore js 1.0.0-2
- * @license MIT licensed
- *
- * Copyright (C) 2012 Joern Turner
- */
-
-[unresolved]{
-    display: none;
-}
-[disabled] {
-    pointer-events: none;
-    cursor: default;
-}
-[refresh-on-view]{
-    /*opacity: 0;*/
-}
-[required]:after {
-    content: "*";
-    display: inline;
-    color: red;
-}
-
-.error{
-    background: var(--paper-red-500);
-}
-
-fx-alert{
-    color:darkred;
-    font-size: 0.9rem;
-}
-
-fx-control, fx-trigger{
-    white-space: nowrap;
-    position: relative;
-}
-
-.fx-checkbox{
-    white-space: nowrap;
-}
-fx-dialog{
-    display: none;
-}
-fx-dialog.show{
-    display: block;
-    min-height: 200px;
-    border-radius: 0.5rem;
-    /*opacity: 0.3;*/
-    background:rgba(0,0,0,0.5);
-    z-index: 10;
-}
-fx-dialog.show .dialog-content{
-    padding: 1rem;
-    width:fit-content;
-    height:fit-content;
-    border:thin solid;
-    border-radius: 0.3rem;
-    position: absolute;
-    left:50%;
-    top:50%;
-    transform:translateX(-50%) translateY(-50%);
-    background: white;
-
-}
-fx-dialog a.close-dialog{
-    position: absolute;
-    right: 0.4rem;
-    top:0.2rem;
-    color:var(--paper-grey-900);
-    text-decoration: none;
-    font-size:1.2rem;
-}
-fx-dialog .action{
-    width: 100%;
-    text-align: center;
-    display: block;
-}
-
-fx-hint{
-    display: none;
-}
-
-/* fx-inspector styles */
-fx-inspector{
-    position:fixed;
-    left:0;
-    right:0;
-    bottom:0;
-    width: 100%;
-    background: var(--inspector-bg);
-    color: white;
-    max-height: 33%;
-    overflow: scroll;
-    border-top:3px solid black;
-    opacity: 0.9;
-}
-fx-inspector::before{
-    content:'Instance Inspector';
-    font-style:italic;
-    position:absolute;
-    top:0;
-    right: 0.3rem;
-    z-index: 10;
-    font-size: 0.8rem;
-}
-fx-inspector details{
-    padding: 1rem;
-}
-fx-inspector pre{
-    background: var(--inspector-pre-bg);
-    border-radius: 0.5rem;
-    padding: 0.3rem;
-    max-height: var(--inspector-instance-height);
-    /*overflow: scroll;*/
-}
-fx-inspector details{
-    overflow: auto;
-    margin:0;
-}
-fx-inspector summary{
-    padding: 0;
-}
-
-fx-model, fx-model *, fx-model ::slotted(fx-instance), fx-instance{
-    display:none;
-}
-
-fx-trigger a[disabled] {
-    color:lightgrey;
-}
-fx-trigger img[disabled]{
-    filter:blur(2px);
-}
-
-fx-repeatitem{
-    position:relative;
-    /*
-    opacity:1;
-    -webkit-transition: opacity 3s;
-    -moz-transition: opacity 3s;
-    transition: opacity 3s;
-    */
-}
-.hidden {
-    visibility: hidden;
-    opacity: 0;
-    transition: visibility 0s 2s, opacity 2s linear;
-}
-
-.loaded{
-    animation: fadein 0.3s forwards;
-}
-/* avoid flicker from nested lazily loaded elements */
-.loaded .loaded{
-    animation: none;
-    opacity: 1;
-}
-
-.logtree details{
-    padding:0.1rem 1rem;
-    margin:0;
-}
-.logtree details summary{
-
-}
-
-.non-relevant{
-    opacity: 0;
-    height: 0;
-    transition: opacity 1s;
-}
-.required:after {
-    content: '*';
-    color: red;
-    padding-left: 4px;
-    right:3px;
-    top:3px;
-    z-index: 1;
-}
-
-.vertical label{
-    display: block;
-}
-@keyframes fadein {
-    0% {
-        opacity:0;
-    }
-    100% {
-        opacity:1;
-    }
-}
-
-
-

package/src/DependencyNotifyingDomFacade.js

@@ -45,7 +45,7 @@ export class DependencyNotifyingDomFacade {
    * @param  bucket - The bucket that matches the attribute that will be used.
    */
   // eslint-disable-next-line class-methods-use-this
-/*
+  /*
   getChildNodes(node, bucket) {
     const matchingNodes = Array.from(node.childNodes).filter(
       childNode => !bucket || getBucketsForNode(childNode).includes(bucket),
@@ -56,10 +56,12 @@ export class DependencyNotifyingDomFacade {
 
   getChildNodes(node, bucket) {
     const matchingNodes = Array.from(node.childNodes).filter(
-        childNode => !bucket || getBucketsForNode(childNode).includes(bucket));
+      childNode => !bucket || getBucketsForNode(childNode).includes(bucket),
+    );
     matchingNodes.forEach(matchingNode => this._onNodeTouched(matchingNode));
     return matchingNodes;
   }
+
   /**
    * Get the data of this node.
    *
@@ -83,11 +85,11 @@ export class DependencyNotifyingDomFacade {
    * @param  bucket - The bucket that matches the attribute that will be used.
    */
   getFirstChild(node, bucket) {
-    const matchingNode = Array.from(this.getChildNodes()).filter(
-      childNode => !bucket || getBucketsForNode(childNode).includes(bucket),
-    )[0];
-    if (matchingNode) {
-      return matchingNode;
+    for (const child of node.childNodes) {
+      if (!bucket || getBucketsForNode(child).includes(bucket)) {
+        this._onNodeTouched(node);
+        return child;
+      }
     }
     return null;
   }

package/src/ForeElementMixin.js

@@ -7,6 +7,11 @@ import {
 } from './xpath-evaluation.js';
 import getInScopeContext from './getInScopeContext.js';
 
+/**
+ * Mixin containing all general functions that are shared by all Fore element classes.
+ * @param superclass
+ * @returns {{readonly properties: {ref: {type: StringConstructor}, context: {type: ObjectConstructor}, nodeset: {type: ObjectConstructor}, model: {type: ObjectConstructor}, inScopeVariables: {type: MapConstructor}, modelItem: {type: ObjectConstructor}}, new(): ForeElementMixin, context: null, model: null, modelItem: {}, ref: *|string, inScopeVariables: null, nodeset: *, prototype: ForeElementMixin}}
+ */
 export const foreElementMixin = superclass =>
   class ForeElementMixin extends superclass {
     static get properties() {
@@ -94,10 +99,19 @@ export const foreElementMixin = superclass =>
      */
     evalInContext() {
       // const inscopeContext = this.getInScopeContext();
-      const inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
+      let inscopeContext;
+      if(this.hasAttribute('context')){
+        inscopeContext = getInScopeContext(this.getAttributeNode('context') || this, this.context);
+      }
+      if(this.hasAttribute('ref')){
+        inscopeContext = getInScopeContext(this.getAttributeNode('ref') || this, this.ref);
+      }
       if (!inscopeContext) {
+        // ### always fall back to default context with there's neither a 'context' or 'ref' present
+        inscopeContext = this.getModel().getDefaultInstance().getDefaultContext();
         console.warn('no in scopeContext for ', this);
-        return;
+        console.warn('using default context ', this);
+        // return;
       }
       if (this.ref === '') {
         this.nodeset = inscopeContext;

package/src/actions/abstract-action.js

@@ -198,6 +198,9 @@ export class AbstractAction extends foreElementMixin(HTMLElement) {
   }
 
   /**
+   * dispathes action-performed event
+   *
+   * @event action-performed - whenever an action has been run
    */
   dispatchActionPerformed() {
     console.log('action-performed ', this);

package/src/actions/fx-action.js

@@ -54,6 +54,7 @@ export class FxAction extends AbstractAction {
       // this.needsUpdate = false;
     }
   }
+
 }
 
 window.customElements.define('fx-action', FxAction);