# HG changeset patch # User cin # Date 2021-05-21 00:18:56 # Node ID ff3695b0a48f00155ad6c3d7e000fe185ee6f95a # Parent e3c05e9785a2ae916013e9eaf1c2d602dc45412c Fixed RenditionBase.placeAt for DjxFragment diff --git a/djx/package-lock.json b/djx/package-lock.json --- a/djx/package-lock.json +++ b/djx/package-lock.json @@ -19,7 +19,7 @@ "eslint": "6.8.0", "requirejs": "2.3.6", "tslint": "^6.1.3", - "typescript": "4.0.2", + "typescript": "4.2.4", "yaml": "~1.7.2" }, "peerDependencies": { @@ -1446,9 +1446,9 @@ } }, "node_modules/typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", + "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2681,9 +2681,9 @@ "dev": true }, "typescript": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz", - "integrity": "sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz", + "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==", "dev": true }, "uri-js": { diff --git a/djx/src/main/ts/tsx/FunctionRendition.ts b/djx/src/main/ts/tsx/FunctionRendition.ts --- a/djx/src/main/ts/tsx/FunctionRendition.ts +++ b/djx/src/main/ts/tsx/FunctionRendition.ts @@ -17,9 +17,7 @@ export class FunctionRendition extends R const _attrs: any = attrs || {}; const _children = children.map(x => this.getItemDom(x)); this._node = this.getItemDom( - this._component.length === 2 ? - this._component.call(null, { ..._attrs }, _children) : - this._component.call(null, { ..._attrs, children: _children }) + this._component.call(null, { ..._attrs, children: _children }) ); } diff --git a/djx/src/main/ts/tsx/RenditionBase.ts b/djx/src/main/ts/tsx/RenditionBase.ts --- a/djx/src/main/ts/tsx/RenditionBase.ts +++ b/djx/src/main/ts/tsx/RenditionBase.ts @@ -31,7 +31,7 @@ export abstract class RenditionBase { const items = []; - for (let i = 0, n = items.length; i < length; i++) { + for (let i = 0, n = collection.length; i < n; i++) { items.push(collection[i]); } return items; @@ -103,11 +103,11 @@ export abstract class RenditionBase