From 6e5fb04d3f3f9a6cd43ac20896d73321dd079f96 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 8 Nov 2016 15:07:07 +0100 Subject: Squashed 'thirdparty/preact/' changes from b2d90cc..ba094e2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ba094e2 Run only local tests for pull requests (#390) e9fc3c2 Fix CI build (#386) 70a5ca3 This adds a link to preact-i18nline. (#382) 5dffd85 Merge branch 'pr-fix-build-for-windows' of https://github.com/Download/preact f14edf7 kilobits => kilobytes (#383) c193547 Test for #292 284e4aa 6.4.0 24eab2f Prevent accidental duplicate recycling of elements when swapping the base element of a component. Fixes #373. 76c5ef7 fix lint error 8008886 When swapping the base of a composed child component, update its parent's base reference. Fixes #349. fd4f21f Add an equality check prior to setting `.nodeValue` on text nodes, since Firefox (and maybe others) don't do this internally by default. Fixes #368 - thanks @zbinlin! 1555e2b Add CDNJS version badge in readme (#365) 79c8bae Disable React Developer Tools integration tests under IE (#362) 84f4eeb Refactor `linkState()` a bit to drop around 40 bytes. Coincidentally, that's the exact size of the hooks just added for DevTools... 👌 22bbfcb Little tweaks 👯 f8b326e Document how to use the React DevTools with Preact (#354) 1f4a8eb Correct "preact/devtools" type definitions (#355) 68f22eb Add React Developer Tools integration (#339) 2a7a027 Add ref and allow objects in className (#316) 4a59cca fix readme todomvc link (#345) 37ca4e0 Fixes build for Windows #343 cf93387 6.3.0 ff05818 Make `VNode.children` *always* be an Array, even when there are no children. 9b095f4 Added link to preact-layout (#342) git-subtree-dir: thirdparty/preact git-subtree-split: ba094e27b602cb16aded7dcad95f71e44b7b0476 --- src/dom/index.js | 9 ++++----- src/h.js | 9 ++++----- src/linked-state.js | 24 ++++++++++-------------- src/options.js | 9 +++++++++ src/preact.d.ts | 21 ++++++++++++++++----- src/vdom/component.js | 27 +++++++++++++++++++-------- src/vdom/diff.js | 25 ++++++++++++++++--------- src/vdom/index.js | 7 +++---- 8 files changed, 81 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/dom/index.js b/src/dom/index.js index 248a3cdc5..b72d056af 100644 --- a/src/dom/index.js +++ b/src/dom/index.js @@ -1,4 +1,4 @@ -import { ATTR_KEY, NON_DIMENSION_PROPS, NON_BUBBLING_EVENTS } from '../constants'; +import { NON_DIMENSION_PROPS, NON_BUBBLING_EVENTS } from '../constants'; import options from '../options'; import { toLowerCase, isString, isFunction, hashToClassName } from '../util'; @@ -20,8 +20,7 @@ export function removeNode(node) { * @param {any} previousValue The last value that was set for this name/node pair * @private */ -export function setAccessor(node, name, value, old, isSvg) { - node[ATTR_KEY][name] = value; +export function setAccessor(node, name, old, value, isSvg) { if (name==='className') name = 'class'; @@ -29,8 +28,8 @@ export function setAccessor(node, name, value, old, isSvg) { value = hashToClassName(value); } - if (name==='key' || name==='children' || name==='innerHTML') { - // skip these + if (name==='key') { + // ignore } else if (name==='class' && !isSvg) { node.className = value || ''; diff --git a/src/h.js b/src/h.js index e57ce4bde..c137bec84 100644 --- a/src/h.js +++ b/src/h.js @@ -2,8 +2,7 @@ import { VNode } from './vnode'; import options from './options'; -let stack = []; - +const stack = []; /** JSX/hyperscript reviver @@ -16,7 +15,8 @@ let stack = []; * render(foo, document.body); */ export function h(nodeName, attributes) { - let children, lastSimple, child, simple, i; + let children = [], + lastSimple, child, simple, i; for (i=arguments.length; i-- > 2; ) { stack.push(arguments[i]); } @@ -35,8 +35,7 @@ export function h(nodeName, attributes) { children[children.length-1] += child; } else { - if (children) children.push(child); - else children = [child]; + children.push(child); lastSimple = simple; } } diff --git a/src/linked-state.js b/src/linked-state.js index ed72bd8bc..b6959df73 100644 --- a/src/linked-state.js +++ b/src/linked-state.js @@ -8,21 +8,17 @@ import { isString, delve } from './util'; * @private */ export function createLinkedState(component, key, eventPath) { - let path = key.split('.'), - p0 = path[0]; + let path = key.split('.'); return function(e) { - let t = e && e.currentTarget || this, - s = component.state, - obj = s, - v = isString(eventPath) ? delve(e, eventPath) : t.nodeName ? ((t.nodeName+t.type).match(/^input(che|rad)/i) ? t.checked : t.value) : e, - i; - if (path.length>1) { - for (i=0; i void; } interface VNode { @@ -51,8 +57,8 @@ declare namespace preact { abstract render(props:PropsType & ComponentProps, state:any):JSX.Element; } - function h(node:ComponentConstructor, params:PropsType, ...children:(JSX.Element|string)[]):JSX.Element; - function h(node:string, params:JSX.HTMLAttributes&JSX.SVGAttributes, ...children:(JSX.Element|string)[]):JSX.Element; + function h(node:ComponentConstructor, params:PropsType, ...children:(JSX.Element|JSX.Element[]|string)[]):JSX.Element; + function h(node:string, params:JSX.HTMLAttributes&JSX.SVGAttributes&{[propName: string]: any}, ...children:(JSX.Element|JSX.Element[]|string)[]):JSX.Element; function render(node:JSX.Element, parent:Element, merge?:boolean):Element; @@ -72,6 +78,11 @@ declare module "preact" { export = preact; } +declare module "preact/devtools" { + // Empty. This module initializes the React Developer Tools integration + // when imported. +} + declare namespace JSX { interface Element extends preact.VNode { @@ -277,8 +288,8 @@ declare namespace JSX { charSet?:string; challenge?:string; checked?:boolean; - class?:string; - className?:string; + class?:string | { [key:string]: boolean }; + className?:string | { [key:string]: boolean }; cols?:number; colSpan?:number; content?:string; @@ -551,4 +562,4 @@ declare namespace JSX { tspan:SVGAttributes; use:SVGAttributes; } -} +} \ No newline at end of file diff --git a/src/vdom/component.js b/src/vdom/component.js index bb2e4fa5d..64e7ff81f 100644 --- a/src/vdom/component.js +++ b/src/vdom/component.js @@ -154,11 +154,11 @@ export function renderComponent(component, opts, mountAll, isChild) { let baseParent = initialBase.parentNode; if (baseParent && base!==baseParent) { baseParent.replaceChild(base, initialBase); - } - if (!cbase && !toUnmount && component._parentComponent) { - initialBase._component = null; - recollectNodeTree(initialBase); + if (!toUnmount) { + initialBase._component = null; + recollectNodeTree(initialBase); + } } } @@ -170,7 +170,9 @@ export function renderComponent(component, opts, mountAll, isChild) { if (base && !isChild) { let componentRef = component, t = component; - while ((t=t._parentComponent)) { componentRef = t; } + while ((t=t._parentComponent)) { + (componentRef = t).base = base; + } base._component = componentRef; base._componentConstructor = componentRef.constructor; } @@ -179,8 +181,11 @@ export function renderComponent(component, opts, mountAll, isChild) { if (!isUpdate || mountAll) { mounts.unshift(component); } - else if (!skip && component.componentDidUpdate) { - component.componentDidUpdate(previousProps, previousState, previousContext); + else if (!skip) { + if (component.componentDidUpdate) { + component.componentDidUpdate(previousProps, previousState, previousContext); + } + if (options.afterUpdate) options.afterUpdate(component); } let cb = component._renderCallbacks, fn; @@ -218,7 +223,11 @@ export function buildComponentFromVNode(dom, vnode, context, mountAll) { } c = createComponent(vnode.nodeName, props, context); - if (dom && !c.nextBase) c.nextBase = dom; + if (dom && !c.nextBase) { + c.nextBase = dom; + // passing dom/oldDom as nextBase will recycle it if unused, so bypass recycling on L241: + oldDom = null; + } setComponentProps(c, props, SYNC_RENDER, context, mountAll); dom = c.base; @@ -239,6 +248,8 @@ export function buildComponentFromVNode(dom, vnode, context, mountAll) { * @private */ export function unmountComponent(component, remove) { + if (options.beforeUnmount) options.beforeUnmount(component); + // console.log(`${remove?'Removing':'Unmounting'} component: ${component.constructor.name}`); let base = component.base; diff --git a/src/vdom/diff.js b/src/vdom/diff.js index 691434e98..794a79aaa 100644 --- a/src/vdom/diff.js +++ b/src/vdom/diff.js @@ -6,6 +6,7 @@ import { buildComponentFromVNode } from './component'; import { setAccessor } from '../dom/index'; import { createNode, collectNode } from '../dom/recycler'; import { unmountComponent } from './component'; +import options from '../options'; /** Diff recursion count, used to track the end of the diff cycle. */ @@ -20,6 +21,7 @@ let isSvgMode = false; export function flushMounts() { let c; while ((c=mounts.pop())) { + if (options.afterMount) options.afterMount(c); if (c.componentDidMount) c.componentDidMount(); } } @@ -52,7 +54,9 @@ function idiff(dom, vnode, context, mountAll) { if (isString(vnode)) { if (dom) { if (dom instanceof Text && dom.parentNode) { - dom.nodeValue = vnode; + if (dom.nodeValue!=vnode) { + dom.nodeValue = vnode; + } return dom; } recollectNodeTree(dom); @@ -66,7 +70,8 @@ function idiff(dom, vnode, context, mountAll) { let out = dom, nodeName = vnode.nodeName, - prevSvgMode = isSvgMode; + prevSvgMode = isSvgMode, + vchildren = vnode.children; if (!isString(nodeName)) { nodeName = String(nodeName); @@ -86,11 +91,13 @@ function idiff(dom, vnode, context, mountAll) { } // fast-path for elements containing a single TextNode: - if (vnode.children && vnode.children.length===1 && typeof vnode.children[0]==='string' && out.childNodes.length===1 && out.firstChild instanceof Text) { - out.firstChild.nodeValue = vnode.children[0]; + if (vchildren && vchildren.length===1 && typeof vchildren[0]==='string' && out.childNodes.length===1 && out.firstChild instanceof Text) { + if (out.firstChild.nodeValue!=vchildren[0]) { + out.firstChild.nodeValue = vchildren[0]; + } } - else if (vnode.children || out.firstChild) { - innerDiffNode(out, vnode.children, context, mountAll); + else if (vchildren && vchildren.length || out.firstChild) { + innerDiffNode(out, vchildren, context, mountAll); } let props = out[ATTR_KEY]; @@ -232,15 +239,15 @@ export function recollectNodeTree(node, unmountOnly) { function diffAttributes(dom, attrs, old) { for (let name in old) { if (!(attrs && name in attrs) && old[name]!=null) { - setAccessor(dom, name, null, old[name], isSvgMode); + setAccessor(dom, name, old[name], old[name] = undefined, isSvgMode); } } // new & updated if (attrs) { for (let name in attrs) { - if (!(name in old) || attrs[name]!==(name==='value' || name==='checked' ? dom[name] : old[name])) { - setAccessor(dom, name, attrs[name], old[name], isSvgMode); + if (name!=='children' && name!=='innerHTML' && (!(name in old) || attrs[name]!==(name==='value' || name==='checked' ? dom[name] : old[name]))) { + setAccessor(dom, name, old[name], old[name] = attrs[name], isSvgMode); } } } diff --git a/src/vdom/index.js b/src/vdom/index.js index 50d4ca2b9..f59fbae21 100644 --- a/src/vdom/index.js +++ b/src/vdom/index.js @@ -33,9 +33,10 @@ export function isNamedNode(node, nodeName) { * @returns {Object} props */ export function getNodeProps(vnode) { - let defaultProps = vnode.nodeName.defaultProps, - props = clone(vnode.attributes); + let props = clone(vnode.attributes); + props.children = vnode.children; + let defaultProps = vnode.nodeName.defaultProps; if (defaultProps) { for (let i in defaultProps) { if (props[i]===undefined) { @@ -44,7 +45,5 @@ export function getNodeProps(vnode) { } } - if (vnode.children) props.children = vnode.children; - return props; } -- cgit v1.2.3