solid-js 1.1.6-beta.1 → 1.2.0

package/README.md

@@ -115,11 +115,9 @@ For TypeScript remember to set your TSConfig to handle Solid's JSX by:
 ## Documentation
 
 Check out the [Documentation](https://www.solidjs.com/guide) website.
-### Resources
 
-- [Examples](https://github.com/solidjs/solid/blob/main/documentation/resources/examples.md)
-- [Articles](https://github.com/solidjs/solid/blob/main/documentation/resources/articles.md)
-- [Projects](https://github.com/solidjs/solid/blob/main/documentation/resources/projects.md)
+[Examples](https://github.com/solidjs/solid/blob/main/documentation/resources/examples.md)
+
 ## Browser Support
 
 The last 2 versions of modern evergreen browsers and Node LTS.

package/dist/dev.cjs

@@ -230,7 +230,7 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   const contexts = new Set(),
-        [s, set] = createSignal(options?.initialValue),
+        [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -455,6 +455,11 @@ function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
 function startTransition(fn, cb) {
+  if (Transition && Transition.running) {
+    fn();
+    cb && Transition.cb.push(cb);
+    return;
+  }
   queueMicrotask(() => {
     if (Scheduler || SuspenseContext) {
       Transition || (Transition = {
@@ -1166,23 +1171,26 @@ const propTraps = {
     return _.keys();
   }
 };
+function resolveSource(s) {
+  return typeof s === "function" ? s() : s;
+}
 function mergeProps(...sources) {
   return new Proxy({
     get(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        const v = sources[i][property];
+        const v = resolveSource(sources[i])[property];
         if (v !== undefined) return v;
       }
     },
     has(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in sources[i]) return true;
+        if (property in resolveSource(sources[i])) return true;
       }
       return false;
     },
     keys() {
       const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(sources[i]));
+      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
       return [...new Set(keys)];
     }
   }, propTraps);

package/dist/dev.js

@@ -226,7 +226,7 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   const contexts = new Set(),
-        [s, set] = createSignal(options?.initialValue),
+        [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -451,6 +451,11 @@ function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
 function startTransition(fn, cb) {
+  if (Transition && Transition.running) {
+    fn();
+    cb && Transition.cb.push(cb);
+    return;
+  }
   queueMicrotask(() => {
     if (Scheduler || SuspenseContext) {
       Transition || (Transition = {
@@ -1162,23 +1167,26 @@ const propTraps = {
     return _.keys();
   }
 };
+function resolveSource(s) {
+  return typeof s === "function" ? s() : s;
+}
 function mergeProps(...sources) {
   return new Proxy({
     get(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        const v = sources[i][property];
+        const v = resolveSource(sources[i])[property];
         if (v !== undefined) return v;
       }
     },
     has(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in sources[i]) return true;
+        if (property in resolveSource(sources[i])) return true;
       }
       return false;
     },
     keys() {
       const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(sources[i]));
+      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
       return [...new Set(keys)];
     }
   }, propTraps);

package/dist/solid.cjs

@@ -227,7 +227,7 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   const contexts = new Set(),
-        [s, set] = createSignal(options?.initialValue),
+        [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -452,6 +452,11 @@ function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
 function startTransition(fn, cb) {
+  if (Transition && Transition.running) {
+    fn();
+    cb && Transition.cb.push(cb);
+    return;
+  }
   queueMicrotask(() => {
     if (Scheduler || SuspenseContext) {
       Transition || (Transition = {
@@ -1090,23 +1095,26 @@ const propTraps = {
     return _.keys();
   }
 };
+function resolveSource(s) {
+  return typeof s === "function" ? s() : s;
+}
 function mergeProps(...sources) {
   return new Proxy({
     get(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        const v = sources[i][property];
+        const v = resolveSource(sources[i])[property];
         if (v !== undefined) return v;
       }
     },
     has(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in sources[i]) return true;
+        if (property in resolveSource(sources[i])) return true;
       }
       return false;
     },
     keys() {
       const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(sources[i]));
+      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
       return [...new Set(keys)];
     }
   }, propTraps);

package/dist/solid.js

@@ -223,7 +223,7 @@ function createResource(source, fetcher, options) {
     source = true;
   }
   const contexts = new Set(),
-        [s, set] = createSignal(options?.initialValue),
+        [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -448,6 +448,11 @@ function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
 function startTransition(fn, cb) {
+  if (Transition && Transition.running) {
+    fn();
+    cb && Transition.cb.push(cb);
+    return;
+  }
   queueMicrotask(() => {
     if (Scheduler || SuspenseContext) {
       Transition || (Transition = {
@@ -1086,23 +1091,26 @@ const propTraps = {
     return _.keys();
   }
 };
+function resolveSource(s) {
+  return typeof s === "function" ? s() : s;
+}
 function mergeProps(...sources) {
   return new Proxy({
     get(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        const v = sources[i][property];
+        const v = resolveSource(sources[i])[property];
         if (v !== undefined) return v;
       }
     },
     has(property) {
       for (let i = sources.length - 1; i >= 0; i--) {
-        if (property in sources[i]) return true;
+        if (property in resolveSource(sources[i])) return true;
       }
       return false;
     },
     keys() {
       const keys = [];
-      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(sources[i]));
+      for (let i = 0; i < sources.length; i++) keys.push(...Object.keys(resolveSource(sources[i])));
       return [...new Set(keys)];
     }
   }, propTraps);

package/h/README.md

@@ -0,0 +1,99 @@
+# Solid HyperScript
+
+This sub module provides a HyperScript method for Solid. This is useful to use Solid in non-compiled environments or in some environments where you can only use a standard JSX transform. This method can be used as the JSX factory function.
+
+HyperScript function takes a few forms. The 2nd props argument is optional. Children may be passed as either an array to the 2nd/3rd argument or as every argument past the 2nd.
+
+```js
+// create an element with a title attribute
+h("button", { title: "My button" }, "Click Me")
+
+// create a component with a title prop
+h(Button, { title: "My button" }, "Click Me")
+
+// create an element with many children
+h("div", { title: "My button" }, h("span", "1"), h("span", "2"), h("span", "3"))
+```
+
+This is the least efficient way to use Solid as it requires a slightly larger runtime that isn't treeshakebable, and cannot leverage anything in the way of analysis, so it requires manual wrapping of expressions and has a few other caveats (see below).
+
+## Example
+
+```js
+import { render } from "solid-js/web";
+import h from "solid-js/h";
+import { createSignal } from "solid-js";
+
+function Button(props) {
+  return h("button.btn-primary", props)
+}
+
+function Counter() {
+  const [count, setCount] = createSignal(0);
+  const increment = (e) => setCount(c => c + 1);
+
+  return h(Button, { type: "button", onClick: increment }, count);
+}
+
+render(Counter, document.getElementById("app"));
+```
+
+## Differences from JSX
+
+There are a few differences from Solid's JSX that are important to note. And also apply when attempting use any transformation that would compile to HyperScript.
+
+1. Reactive expression must be manually wrapped in functions to be reactive.
+
+```js
+// jsx
+<div id={props.id}>{firstName() + lastName()}</div>
+
+// hyperscript
+h("div", { id: () => props.id }, () => firstName() + lastName())
+```
+
+2. Merging spreads requires using the merge props helper to keep reactivity
+
+```js
+// jsx
+<div class={selectedClass()} {...props} />
+
+// hyperscript
+import { mergeProps } from "solid-js"
+
+h("div", mergeProps({ class: selectedClass }, props))
+```
+
+3. Events on components require explicit event in the arguments
+
+Solid's HyperScript automatically wraps functions passed to props of components with no arguments in getters so you need to provide one to prevent this. The same applies to render props like in the `<For>` component.
+
+```js
+// good
+h(Button, { onClick: (e) => console.log("Hi")});
+
+// bad
+h(Button, { onClick: () => console.log("Hi")})
+```
+
+4. All refs are callback form
+
+We can't do the compiled assigment trick so only the callback form is supported.
+
+```js
+let myEl;
+
+h(div, { ref: (el) => myEl = el });
+```
+
+5. There is a shorthand for static id and classes
+
+```js
+h("div#some-id.my-class")
+```
+
+6. Fragments are just arrays
+
+```js
+[h("span", "1"), h("span", "2")]
+```

package/html/README.md

@@ -0,0 +1,84 @@
+# Solid Tagged Template Literals
+
+This sub module provides a Tagged Template Literal `html` method for Solid. This is useful to use Solid in non-compiled environments. This method can be used as replacement for JSX.
+
+`html` uses `${}` to escape into JavaScript expressions. Components are closed with `<//>`
+
+```js
+// create an element with a title attribute
+html`<button title="My button">Click Me</button>`
+
+// create a component with a title prop
+html`<${Button} title="My button">Click me<//>`
+
+// create an element with dynamic attribute and spread
+html`<div title=${() => selectedClass()} ...${props} />`
+```
+
+Using `html` is slightly less efficient than JSX(but more than HyperScript), requires a larger runtime that isn't treeshakebable, and cannot leverage expression analysis, so it requires manual wrapping of expressions and has a few other caveats (see below).
+
+## Example
+
+```js
+import { render } from "solid-js/web";
+import html from "solid-js/html";
+import { createSignal } from "solid-js";
+
+function Button(props) {
+  return html`<button class="btn-primary" ...${props} />`;
+}
+
+function Counter() {
+  const [count, setCount] = createSignal(0);
+  const increment = (e) => setCount((c) => c + 1);
+
+  return html`<${Button} type="button" onClick=${increment}>${count}<//>`;
+}
+
+render(Counter, document.getElementById("app"));
+```
+
+## Differences from JSX
+
+There are a few differences from Solid's JSX that are important to note.
+
+1. Reactive expression must be manually wrapped in functions to be reactive.
+
+```js
+// jsx
+<div id={props.id}>{firstName() + lastName()}</div>
+
+// hyperscript
+html`<div id=${() => props.id}>${() => firstName() + lastName()}</div>`
+```
+
+2. Events on components require explicit event in the arguments
+
+Solid's Tagged Template Literals automatically wraps functions passed to props of components with no arguments in getters so you need to provide one to prevent this. The same applies to render props like in the `<For>` component.
+
+```js
+// good
+html`<${Button} onClick=${(e) => console.log("Hi")} />`;
+
+// bad
+html`<${Button} onClick=${() => console.log("Hi")} />`;
+```
+
+4. All refs are callback form
+
+We can't do the compiled assigment trick so only the callback form is supported.
+
+```js
+let myEl;
+html`<div ref=${(el) => myEl = el} />`;
+```
+
+5. There can be multiple top level elements
+
+No need for fragments just:
+```js
+html`
+  <div>1</div>
+  <div>2</div>
+`
+```

package/html/dist/html.cjs

@@ -213,7 +213,7 @@ function createHTML(r, {
       markup = markup + statics[i] + "<!--#-->";
     }
     markup = markup + statics[i];
-    markup = markup.replace(selfClosing, fullClosing).replace(/<(<!--#-->)/g, "<###").replace(attrSeeker, attrReplacer).replace(/>\n+\s*/g, ">").replace(/\n+\s*</g, "<").replace(/\s+</g, " <").replace(/>\s+/g, "> ");
+    markup = markup.replace(selfClosing, fullClosing).replace(/<(<!--#-->)/g, "<###").replace(/\.\.\.(<!--#-->)/g, "###").replace(attrSeeker, attrReplacer).replace(/>\n+\s*/g, ">").replace(/\n+\s*</g, "<").replace(/\s+</g, " <").replace(/>\s+/g, "> ");
     const [html, code] = parseTemplate(parse(markup)),
           templates = [];
     for (let i = 0; i < html.length; i++) {
@@ -323,16 +323,29 @@ function createHTML(r, {
     options.counter = childOptions.counter;
     options.templateId = childOptions.templateId;
   }
+  function processComponentProps(propGroups) {
+    let result = [];
+    for (const props of propGroups) {
+      if (Array.isArray(props)) {
+        if (!props.length) continue;
+        result.push(`r.wrapProps({${props.join(",") || ""}})`);
+      } else result.push(props);
+    }
+    return result.length > 1 ? `r.mergeProps(${result.join(",")})` : result[0];
+  }
   function processComponent(node, options) {
+    let props = [];
     const keys = Object.keys(node.attrs),
-          props = [],
+          propGroups = [props],
           componentIdentifier = options.counter++;
     for (let i = 0; i < keys.length; i++) {
       const name = keys[i],
             value = node.attrs[name];
-      if (value === "###") {
-        let count = options.counter++;
-        props.push(`${name}: exprs[${count}]`);
+      if (name === "###") {
+        propGroups.push(`exprs[${options.counter++}]`);
+        propGroups.push(props = []);
+      } else if (value === "###") {
+        props.push(`${name}: exprs[${options.counter++}]`);
       } else props.push(`${name}: "${value}"`);
     }
     if (node.children.length === 1 && node.children[0].type === "comment" && node.children[0].content === "#") {
@@ -357,7 +370,7 @@ function createHTML(r, {
       tag = `_$el${uuid++}`;
       options.decl.push(`${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
     }
-    if (options.parent) options.exprs.push(`r.insert(${options.parent}, r.createComponent(exprs[${componentIdentifier}], r.wrapProps({${props.join(", ") || ""}}))${tag ? `, ${tag}` : ""})`);else options.exprs.push(`${options.fragment ? "" : "return "}r.createComponent(exprs[${componentIdentifier}], r.wrapProps({${props.join(", ") || ""}}))`);
+    if (options.parent) options.exprs.push(`r.insert(${options.parent}, r.createComponent(exprs[${componentIdentifier}],${processComponentProps(propGroups)})${tag ? `, ${tag}` : ""})`);else options.exprs.push(`${options.fragment ? "" : "return "}r.createComponent(exprs[${componentIdentifier}],${processComponentProps(propGroups)})`);
     options.path = tag;
     options.first = false;
   }
@@ -410,6 +423,9 @@ function createHTML(r, {
         if (value === "###") {
           delete node.attrs[name];
           parseAttribute(tag, name, isSVG, isCE, options);
+        } else if (name === "###") {
+          delete node.attrs[name];
+          options.exprs.push(`r.spread(${tag},exprs[${options.counter++}],${isSVG},${!!node.children.length})`);
         }
       }
       options.path = tag;
@@ -470,9 +486,11 @@ var index = createHTML({
   effect: web.effect,
   style: web.style,
   insert: web.insert,
+  spread: web.spread,
   createComponent: web.createComponent,
   delegateEvents: web.delegateEvents,
   classList: web.classList,
+  mergeProps: web.mergeProps,
   dynamicProperty: web.dynamicProperty,
   setAttribute: web.setAttribute,
   setAttributeNS: web.setAttributeNS,

package/html/dist/html.js

@@ -1,4 +1,4 @@
-import { effect, style, insert, createComponent, delegateEvents, classList, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, PropAliases, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
+import { effect, style, insert, spread, createComponent, delegateEvents, classList, mergeProps, dynamicProperty, setAttribute, setAttributeNS, addEventListener, Aliases, PropAliases, Properties, ChildProperties, DelegatedEvents, SVGElements, SVGNamespace } from 'solid-js/web';
 
 var attrRE, lookup, parseTag, pushCommentNode, pushTextNode, tagRE;
 tagRE = /(?:<!--[\S\s]*?-->|<(?:"[^"]*"['"]*|'[^']*'['"]*|[^'">])+>)/g;
@@ -211,7 +211,7 @@ function createHTML(r, {
       markup = markup + statics[i] + "<!--#-->";
     }
     markup = markup + statics[i];
-    markup = markup.replace(selfClosing, fullClosing).replace(/<(<!--#-->)/g, "<###").replace(attrSeeker, attrReplacer).replace(/>\n+\s*/g, ">").replace(/\n+\s*</g, "<").replace(/\s+</g, " <").replace(/>\s+/g, "> ");
+    markup = markup.replace(selfClosing, fullClosing).replace(/<(<!--#-->)/g, "<###").replace(/\.\.\.(<!--#-->)/g, "###").replace(attrSeeker, attrReplacer).replace(/>\n+\s*/g, ">").replace(/\n+\s*</g, "<").replace(/\s+</g, " <").replace(/>\s+/g, "> ");
     const [html, code] = parseTemplate(parse(markup)),
           templates = [];
     for (let i = 0; i < html.length; i++) {
@@ -321,16 +321,29 @@ function createHTML(r, {
     options.counter = childOptions.counter;
     options.templateId = childOptions.templateId;
   }
+  function processComponentProps(propGroups) {
+    let result = [];
+    for (const props of propGroups) {
+      if (Array.isArray(props)) {
+        if (!props.length) continue;
+        result.push(`r.wrapProps({${props.join(",") || ""}})`);
+      } else result.push(props);
+    }
+    return result.length > 1 ? `r.mergeProps(${result.join(",")})` : result[0];
+  }
   function processComponent(node, options) {
+    let props = [];
     const keys = Object.keys(node.attrs),
-          props = [],
+          propGroups = [props],
           componentIdentifier = options.counter++;
     for (let i = 0; i < keys.length; i++) {
       const name = keys[i],
             value = node.attrs[name];
-      if (value === "###") {
-        let count = options.counter++;
-        props.push(`${name}: exprs[${count}]`);
+      if (name === "###") {
+        propGroups.push(`exprs[${options.counter++}]`);
+        propGroups.push(props = []);
+      } else if (value === "###") {
+        props.push(`${name}: exprs[${options.counter++}]`);
       } else props.push(`${name}: "${value}"`);
     }
     if (node.children.length === 1 && node.children[0].type === "comment" && node.children[0].content === "#") {
@@ -355,7 +368,7 @@ function createHTML(r, {
       tag = `_$el${uuid++}`;
       options.decl.push(`${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
     }
-    if (options.parent) options.exprs.push(`r.insert(${options.parent}, r.createComponent(exprs[${componentIdentifier}], r.wrapProps({${props.join(", ") || ""}}))${tag ? `, ${tag}` : ""})`);else options.exprs.push(`${options.fragment ? "" : "return "}r.createComponent(exprs[${componentIdentifier}], r.wrapProps({${props.join(", ") || ""}}))`);
+    if (options.parent) options.exprs.push(`r.insert(${options.parent}, r.createComponent(exprs[${componentIdentifier}],${processComponentProps(propGroups)})${tag ? `, ${tag}` : ""})`);else options.exprs.push(`${options.fragment ? "" : "return "}r.createComponent(exprs[${componentIdentifier}],${processComponentProps(propGroups)})`);
     options.path = tag;
     options.first = false;
   }
@@ -408,6 +421,9 @@ function createHTML(r, {
         if (value === "###") {
           delete node.attrs[name];
           parseAttribute(tag, name, isSVG, isCE, options);
+        } else if (name === "###") {
+          delete node.attrs[name];
+          options.exprs.push(`r.spread(${tag},exprs[${options.counter++}],${isSVG},${!!node.children.length})`);
         }
       }
       options.path = tag;
@@ -468,9 +484,11 @@ var index = createHTML({
   effect,
   style,
   insert,
+  spread,
   createComponent,
   delegateEvents,
   classList,
+  mergeProps,
   dynamicProperty,
   setAttribute,
   setAttributeNS,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.1.6-beta.1",
+  "version": "1.2.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://github.com/solidjs/solid#readme",
@@ -29,6 +29,8 @@
     "h/types",
     "html/dist",
     "html/types",
+    "universal/dist",
+    "universal/types",
     "types",
     "jsx-runtime.d.ts"
   ],
@@ -84,6 +86,15 @@
       "require": "./web/dist/web.cjs"
     },
     "./web/dist/*": "./web/dist/*",
+    "./universal": {
+      "development": {
+        "import": "./universal/dist/dev.js",
+        "require": "./universal/dist/dev.cjs"
+      },
+      "import": "./universal/dist/universal.js",
+      "require": "./universal/dist/universal.cjs"
+    },
+    "./universal/dist/*": "./universal/dist/*",
     "./h": {
       "import": "./h/dist/h.js",
       "require": "./h/dist/h.cjs"
@@ -106,6 +117,7 @@
     "build:types-web": "tsc --project ./web/tsconfig.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
     "build:types-html": "tsc --project ./html/tsconfig.json",
     "build:types-h": "tsc --project ./h/tsconfig.json",
+    "build:types-universal": "tsc --project ./universal/tsconfig.json",
     "bench": "node --allow-natives-syntax bench/bench.cjs",
     "test": "jest && npm run test:types",
     "test:coverage": "jest --coverage && npm run test:types",
@@ -120,5 +132,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "457dca77055fd2a304e8002f4a90ebd8dd3c4999"
+  "gitHead": "e6bbfa693db53cffd3372ee8bf1c61e3f1d47064"
 }

package/store/README.md

@@ -0,0 +1,23 @@
+# Solid Store
+
+This submodules contains the means for handling deeps nested reactivity. It provides 2 main primitives `createStore` and `createMutable` which leverage proxies to create dynamic nested reactive structures.
+
+This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutationa and data diffing.
+
+For full documentation, check out the [website](https://www.solidjs.com/docs/latest/api).
+
+## Example
+
+```js
+import { createStore } from "solid-js/store";
+
+const [store, setStore] = createStore({
+  user: {
+    firstName: "John",
+    lastName: "Smith"
+  }
+});
+
+// update store.user.firstName
+setStore("user", "firstName", "Will");
+```

package/types/jsx.d.ts

@@ -11,7 +11,7 @@ export namespace JSX {
     | Node
     | ArrayElement
     | FunctionElement
-    | string
+    | (string & {})
     | number
     | boolean
     | null
@@ -1674,6 +1674,7 @@ export namespace JSX {
     | "unsafe-url";
   type HTMLIframeSandbox =
     | "allow-downloads-without-user-activation"
+    | "allow-downloads"
     | "allow-forms"
     | "allow-modals"
     | "allow-orientation-lock"
@@ -2116,7 +2117,7 @@ export namespace JSX {
     height?: number | string;
     name?: string;
     referrerpolicy?: HTMLReferrerPolicy;
-    sandbox?: HTMLIframeSandbox;
+    sandbox?: HTMLIframeSandbox | string;
     src?: string;
     srcdoc?: string;
     width?: number | string;