Comparing version 1.5.6 to 1.5.7
@@ -286,6 +286,2 @@ let taskIdCounter = 1, | ||
Transition.running = true; | ||
if (!Transition.promises.size) { | ||
Effects.push.apply(Effects, Transition.effects); | ||
Transition.effects = []; | ||
} | ||
completeLoad(v, error); | ||
@@ -315,3 +311,3 @@ }, false); | ||
if (pr) { | ||
if (c.resolved && Transition) Transition.promises.add(pr);else if (!contexts.has(c)) { | ||
if (c.resolved && Transition && Transition.running) Transition.promises.add(pr);else if (!contexts.has(c)) { | ||
c.increment(); | ||
@@ -804,4 +800,28 @@ contexts.add(c); | ||
let res; | ||
if (Transition && Transition.running) { | ||
if (Transition.promises.size || Transition.queue.size) { | ||
if (Transition) { | ||
if (!Transition.promises.size && !Transition.queue.size) { | ||
const sources = Transition.sources; | ||
const disposed = Transition.disposed; | ||
Effects.push.apply(Effects, Transition.effects); | ||
res = Transition.resolve; | ||
for (const e of Effects) { | ||
"tState" in e && (e.state = e.tState); | ||
delete e.tState; | ||
} | ||
Transition = null; | ||
runUpdates(() => { | ||
for (const d of disposed) cleanNode(d); | ||
for (const v of sources) { | ||
v.value = v.tValue; | ||
if (v.owned) { | ||
for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]); | ||
} | ||
if (v.tOwned) v.owned = v.tOwned; | ||
delete v.tValue; | ||
delete v.tOwned; | ||
v.tState = 0; | ||
} | ||
setTransPending(false); | ||
}, false); | ||
} else if (Transition.running) { | ||
Transition.running = false; | ||
@@ -813,24 +833,2 @@ Transition.effects.push.apply(Transition.effects, Effects); | ||
} | ||
const sources = Transition.sources; | ||
const disposed = Transition.disposed; | ||
res = Transition.resolve; | ||
for (const e of Effects) { | ||
"tState" in e && (e.state = e.tState); | ||
delete e.tState; | ||
} | ||
Transition = null; | ||
runUpdates(() => { | ||
for (const d of disposed) cleanNode(d); | ||
for (const v of sources) { | ||
v.value = v.tValue; | ||
if (v.owned) { | ||
for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]); | ||
} | ||
if (v.tOwned) v.owned = v.tOwned; | ||
delete v.tValue; | ||
delete v.tOwned; | ||
v.tState = 0; | ||
} | ||
setTransPending(false); | ||
}, false); | ||
} | ||
@@ -856,6 +854,2 @@ const e = Effects; | ||
runTop(item); | ||
if (!tasks.size) { | ||
Effects.push.apply(Effects, Transition.effects); | ||
Transition.effects = []; | ||
} | ||
}, false); | ||
@@ -862,0 +856,0 @@ Transition && (Transition.running = false); |
@@ -278,6 +278,2 @@ let taskIdCounter = 1, | ||
Transition.running = true; | ||
if (!Transition.promises.size) { | ||
Effects.push.apply(Effects, Transition.effects); | ||
Transition.effects = []; | ||
} | ||
completeLoad(v, error); | ||
@@ -307,3 +303,3 @@ }, false); | ||
if (pr) { | ||
if (c.resolved && Transition) Transition.promises.add(pr);else if (!contexts.has(c)) { | ||
if (c.resolved && Transition && Transition.running) Transition.promises.add(pr);else if (!contexts.has(c)) { | ||
c.increment(); | ||
@@ -742,4 +738,28 @@ contexts.add(c); | ||
let res; | ||
if (Transition && Transition.running) { | ||
if (Transition.promises.size || Transition.queue.size) { | ||
if (Transition) { | ||
if (!Transition.promises.size && !Transition.queue.size) { | ||
const sources = Transition.sources; | ||
const disposed = Transition.disposed; | ||
Effects.push.apply(Effects, Transition.effects); | ||
res = Transition.resolve; | ||
for (const e of Effects) { | ||
"tState" in e && (e.state = e.tState); | ||
delete e.tState; | ||
} | ||
Transition = null; | ||
runUpdates(() => { | ||
for (const d of disposed) cleanNode(d); | ||
for (const v of sources) { | ||
v.value = v.tValue; | ||
if (v.owned) { | ||
for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]); | ||
} | ||
if (v.tOwned) v.owned = v.tOwned; | ||
delete v.tValue; | ||
delete v.tOwned; | ||
v.tState = 0; | ||
} | ||
setTransPending(false); | ||
}, false); | ||
} else if (Transition.running) { | ||
Transition.running = false; | ||
@@ -751,24 +771,2 @@ Transition.effects.push.apply(Transition.effects, Effects); | ||
} | ||
const sources = Transition.sources; | ||
const disposed = Transition.disposed; | ||
res = Transition.resolve; | ||
for (const e of Effects) { | ||
"tState" in e && (e.state = e.tState); | ||
delete e.tState; | ||
} | ||
Transition = null; | ||
runUpdates(() => { | ||
for (const d of disposed) cleanNode(d); | ||
for (const v of sources) { | ||
v.value = v.tValue; | ||
if (v.owned) { | ||
for (let i = 0, len = v.owned.length; i < len; i++) cleanNode(v.owned[i]); | ||
} | ||
if (v.tOwned) v.owned = v.tOwned; | ||
delete v.tValue; | ||
delete v.tOwned; | ||
v.tState = 0; | ||
} | ||
setTransPending(false); | ||
}, false); | ||
} | ||
@@ -794,6 +792,2 @@ const e = Effects; | ||
runTop(item); | ||
if (!tasks.size) { | ||
Effects.push.apply(Effects, Transition.effects); | ||
Transition.effects = []; | ||
} | ||
}, false); | ||
@@ -800,0 +794,0 @@ Transition && (Transition.running = false); |
{ | ||
"name": "solid-js", | ||
"description": "A declarative JavaScript library for building user interfaces.", | ||
"version": "1.5.6", | ||
"version": "1.5.7", | ||
"author": "Ryan Carniato", | ||
@@ -47,2 +47,9 @@ "license": "MIT", | ||
".": { | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"browser": { | ||
@@ -69,9 +76,2 @@ "development": { | ||
}, | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"node": { | ||
@@ -103,2 +103,9 @@ "import": { | ||
"./store": { | ||
"worker": { | ||
"import": { | ||
"types": "./store/types/index.d.ts", | ||
"default": "./store/dist/server.js" | ||
}, | ||
"require": "./store/dist/server.cjs" | ||
}, | ||
"browser": { | ||
@@ -125,9 +132,2 @@ "development": { | ||
}, | ||
"worker": { | ||
"import": { | ||
"types": "./store/types/index.d.ts", | ||
"default": "./store/dist/server.js" | ||
}, | ||
"require": "./store/dist/server.cjs" | ||
}, | ||
"node": { | ||
@@ -155,2 +155,9 @@ "import": { | ||
"./web": { | ||
"worker": { | ||
"import": { | ||
"types": "./web/types/index.d.ts", | ||
"default": "./web/dist/server.js" | ||
}, | ||
"require": "./web/dist/server.cjs" | ||
}, | ||
"browser": { | ||
@@ -177,9 +184,2 @@ "development": { | ||
}, | ||
"worker": { | ||
"import": { | ||
"types": "./web/types/index.d.ts", | ||
"default": "./web/dist/server.js" | ||
}, | ||
"require": "./web/dist/server.cjs" | ||
}, | ||
"node": { | ||
@@ -186,0 +186,0 @@ "import": { |
@@ -15,2 +15,9 @@ { | ||
".": { | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"browser": { | ||
@@ -37,9 +44,2 @@ "development": { | ||
}, | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"node": { | ||
@@ -46,0 +46,0 @@ "import": { |
@@ -169,7 +169,8 @@ import { createMemo, createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, createSignal, onCleanup, splitProps, $DEVCOMP } from 'solid-js'; | ||
} | ||
function style(node, value, prev = {}) { | ||
function style(node, value, prev) { | ||
if (!value) return prev ? setAttribute(node, "style") : value; | ||
const nodeStyle = node.style; | ||
const prevString = typeof prev === "string"; | ||
if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value; | ||
prevString && (nodeStyle.cssText = undefined, prev = {}); | ||
if (typeof value === "string") return nodeStyle.cssText = value; | ||
typeof prev === "string" && (nodeStyle.cssText = prev = undefined); | ||
prev || (prev = {}); | ||
value || (value = {}); | ||
@@ -221,3 +222,3 @@ let v, s; | ||
if (prop === "children") continue; | ||
assignProp(node, prop, null, prevProps[prop], isSVG, skipRef); | ||
prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef); | ||
} | ||
@@ -224,0 +225,0 @@ } |
@@ -168,7 +168,8 @@ import { createMemo, createRoot, createRenderEffect, sharedConfig, untrack, enableHydration, createSignal, onCleanup, splitProps } from 'solid-js'; | ||
} | ||
function style(node, value, prev = {}) { | ||
function style(node, value, prev) { | ||
if (!value) return prev ? setAttribute(node, "style") : value; | ||
const nodeStyle = node.style; | ||
const prevString = typeof prev === "string"; | ||
if (value == null && prevString || typeof value === "string") return nodeStyle.cssText = value; | ||
prevString && (nodeStyle.cssText = undefined, prev = {}); | ||
if (typeof value === "string") return nodeStyle.cssText = value; | ||
typeof prev === "string" && (nodeStyle.cssText = prev = undefined); | ||
prev || (prev = {}); | ||
value || (value = {}); | ||
@@ -220,3 +221,3 @@ let v, s; | ||
if (prop === "children") continue; | ||
assignProp(node, prop, null, prevProps[prop], isSVG, skipRef); | ||
prevProps[prop] = assignProp(node, prop, null, prevProps[prop], isSVG, skipRef); | ||
} | ||
@@ -223,0 +224,0 @@ } |
@@ -15,2 +15,9 @@ { | ||
".": { | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"browser": { | ||
@@ -37,9 +44,2 @@ "development": { | ||
}, | ||
"worker": { | ||
"import": { | ||
"types": "./types/index.d.ts", | ||
"default": "./dist/server.js" | ||
}, | ||
"require": "./dist/server.cjs" | ||
}, | ||
"node": { | ||
@@ -46,0 +46,0 @@ "import": { |
@@ -24,3 +24,5 @@ import { hydrate as hydrateCore } from "./client.js"; | ||
}): Text; | ||
declare type DynamicProps<T extends ValidComponent> = ComponentProps<T> & { | ||
declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = { | ||
[K in keyof P]: P[K]; | ||
} & { | ||
component: T | undefined; | ||
@@ -27,0 +29,0 @@ }; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
768595
21519