Merge pull request #61 from EPA-WG/develop

0.0.24

README.md

@@ -348,9 +348,9 @@ within template
 [github-image]:   https://cdnjs.cloudflare.com/ajax/libs/octicons/8.5.0/svg/mark-github.svg
 [npm-image]:      https://img.shields.io/npm/v/@epa-wg/custom-element.svg
 [npm-url]:        https://npmjs.org/package/@epa-wg/custom-element
-[coverage-image]: https://unpkg.com/@epa-wg/[email protected].23/coverage/src/custom-element/coverage.svg
-[coverage-url]:   https://unpkg.com/@epa-wg/[email protected].23/coverage/src/custom-element/index.html
-[storybook-url]:  https://unpkg.com/@epa-wg/[email protected].23/storybook-static/index.html?path=/story/welcome--introduction
+[coverage-image]: https://unpkg.com/@epa-wg/[email protected].24/coverage/src/custom-element/coverage.svg
+[coverage-url]:   https://unpkg.com/@epa-wg/[email protected].24/coverage/src/custom-element/index.html
+[storybook-url]:  https://unpkg.com/@epa-wg/[email protected].24/storybook-static/index.html?path=/story/welcome--introduction
 [sandbox-url]:    https://stackblitz.com/github/EPA-WG/custom-element?file=index.html
 [webcomponents-url]: https://www.webcomponents.org/element/@epa-wg/custom-element
 [webcomponents-img]: https://img.shields.io/badge/webcomponents.org-published-blue.svg

bin/xslDtd2Ide.mjs

@@ -116,7 +116,7 @@ writeFileSync( '.././ide/customData-xsl.json', JSON.stringify( vsCode, undefined
 const intelliJ = {
     "$schema": "http://json.schemastore.org/web-types",
     "name": "@epa-wg/custom-element",
-    "version": "0.0.23",
+    "version": "0.0.24",
     "js-types-syntax": "typescript",
     "description-markup": "markdown",
     "contributions": {

custom-element.js

@@ -434,6 +434,14 @@ export function assureUnique(n, id=0)
         e.childNodes.length && assureUnique(e)
     }
 }
+export function appendByDceId(parent,e,k)
+{
+    k = 1*k;
+    for( let n of parent.childNodes )
+        if( (n.dceId ?? n.getAttribute('data-dce-id')*1) > k )
+            return parent.insertBefore(e,n);
+    parent.append(e)
+}
 export function merge( parent, fromArr )
 {
     if(!fromArr.length)
@@ -461,7 +469,7 @@ export function merge( parent, fromArr )
             }
             delete id2old[ k ]
         }else
-            parent.append( e )
+            appendByDceId(parent,e,k)
     }
     for( let v of Object.values(id2old) )
         v.remove();

demo/form.html

@@ -183,8 +183,8 @@
     <ol>
         <li> type in input field</li>
         <li> delete input field content</li>
-        <li> observe the warning in string bellow input</li>
-        <li> Click Next observe the system warning in dropdown and in string bellow input</li>
+        <li> observe the warning in string after input</li>
+        <li> Click Next observe the system warning in dropdown over input</li>
     </ol>
     <template>
         <custom-element>
@@ -197,7 +197,6 @@
                         <var>{//username/@validation-message}</var>
                     </if>
                     <button>Next</button>
-                    <p>{//email-form/@validation-message}</p>
                 </form>
             </template>
         </custom-element>

ide/web-types-dce.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/web-types",
   "name": "@epa-wg/custom-element",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "js-types-syntax": "typescript",
   "description-markup": "markdown",
   "contributions": {

ide/web-types-xsl.json

@@ -1,7 +1,7 @@
 {
     "$schema": "http://json.schemastore.org/web-types",
     "name": "@epa-wg/custom-element",
-    "version": "0.0.23",
+    "version": "0.0.24",
     "js-types-syntax": "typescript",
     "description-markup": "markdown",
     "contributions": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@epa-wg/custom-element",
-    "version": "0.0.23",
+    "version": "0.0.24",
     "description": "Declarative Custom Element as W3C proposal PoC with native(XSLT) based templating",
     "browser": "custom-element.js",
     "module": "custom-element.js",