@realsee/dnalogel 2.6.7-dev.4 → 2.6.7-dev.5

package/libs/PanoTagPlugin/Components/TagContainer.js

@@ -25,15 +25,32 @@ import "../utils/px2rem.js";
 import "./Tag/ImageTextTag.js";
 import "./Common/Line/Polyline.js";
 import "./Common/Media.js";
-import "../../vendor/swiper/svelte/swiper.js";
+import "../../vendor/svelte-carousel/src/components/Carousel/Carousel.js";
+import "../../vendor/svelte-carousel/src/components/Dots/Dots.js";
+import "../../vendor/svelte-carousel/src/components/Dot/Dot.js";
+import "../../vendor/svelte-carousel/src/components/Arrow/Arrow.js";
+import "../../vendor/svelte-carousel/src/direction.js";
+import "../../vendor/svelte-carousel/src/components/Progress/Progress.js";
+import "../../vendor/svelte-carousel/src/actions/swipeable/swipeable.js";
+import "../../vendor/svelte-carousel/src/actions/swipeable/event.js";
+import "../../vendor/svelte-carousel/src/utils/event.js";
+import "../../vendor/svelte-carousel/src/units.js";
+import "../../vendor/svelte-carousel/src/actions/hoverable/hoverable.js";
+import "../../vendor/svelte-carousel/src/actions/hoverable/event.js";
+import "../../vendor/svelte-carousel/src/actions/tappable/tappable.js";
+import "../../vendor/svelte-carousel/src/utils/math.js";
+import "../../vendor/svelte-carousel/src/actions/tappable/event.js";
+import "../../vendor/svelte-carousel/src/utils/page.js";
+import "../../vendor/svelte-carousel/src/utils/clones.js";
+import "../../vendor/svelte-carousel/src/utils/object.js";
+import "../../vendor/svelte-carousel/src/components/Carousel/createCarousel.js";
+import "simply-reactive";
+import "../../vendor/svelte-carousel/src/utils/lazy.js";
+import "../../vendor/svelte-carousel/src/utils/ProgressManager.js";
+import "../../vendor/svelte-carousel/src/utils/interval.js";
 import "swiper";
-import "../../vendor/swiper/components-shared/get-params.js";
-import "../../vendor/swiper/components-shared/utils.js";
-import "../../vendor/swiper/components-shared/params-list.js";
-import "../../vendor/swiper/components-shared/mount-swiper.js";
-import "../../vendor/swiper/components-shared/get-changed-params.js";
-import "../../vendor/swiper/components-shared/update-swiper.js";
 import "../../vendor/swiper/svelte/swiper-slide.js";
+import "../../vendor/swiper/components-shared/utils.js";
 import "swiper/css";
 import "swiper/css/autoplay";
 import "../utils/noTypecheck.js";
@@ -73,58 +90,58 @@ import "./Common/Icon/Icon.js";
 import "../utils/getImageInfo.js";
 import "./Tag/CustomTag.js";
 import "./Common/TagPoint.js";
-function D(l) {
-  A(l, "svelte-uq11d5", ".tag--container.svelte-uq11d5{box-sizing:border-box;position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;opacity:1;-webkit-user-select:none;-moz-user-select:none;user-select:none;transform:translate3d(0, 0, 0)}.withAnimation.svelte-uq11d5{transition:opacity 0.3s linear}.tag--container.hide.svelte-uq11d5{opacity:0;pointer-events:none}.tag--container.hide.svelte-uq11d5 *{pointer-events:none !important}");
+function D(a) {
+  A(a, "svelte-uq11d5", ".tag--container.svelte-uq11d5{box-sizing:border-box;position:absolute;left:0;top:0;width:100%;height:100%;pointer-events:none;opacity:1;-webkit-user-select:none;-moz-user-select:none;user-select:none;transform:translate3d(0, 0, 0)}.withAnimation.svelte-uq11d5{transition:opacity 0.3s linear}.tag--container.hide.svelte-uq11d5{opacity:0;pointer-events:none}.tag--container.hide.svelte-uq11d5 *{pointer-events:none !important}");
 }
-function _(l, t, o) {
-  const e = l.slice();
-  return e[6] = t[o], e;
+function _(a, t, o) {
+  const i = a.slice();
+  return i[6] = t[o], i;
 }
-function d(l) {
-  let t, o = [], e = /* @__PURE__ */ new Map(), n, r = l[1];
-  const p = (i) => i[6].id;
-  for (let i = 0; i < r.length; i += 1) {
-    let m = _(l, r, i), a = p(m);
-    e.set(a, o[i] = g(a, m));
+function d(a) {
+  let t, o = [], i = /* @__PURE__ */ new Map(), m, r = a[1];
+  const l = (e) => e[6].id;
+  for (let e = 0; e < r.length; e += 1) {
+    let n = _(a, r, e), p = l(n);
+    i.set(p, o[e] = g(p, n));
   }
   return {
     c() {
       t = C("div");
-      for (let i = 0; i < o.length; i += 1)
-        o[i].c();
-      z(t, "class", "tag--container svelte-uq11d5"), f(t, "hide", !l[3].visible || !l[4].visible), f(t, "withAnimation", l[0]);
+      for (let e = 0; e < o.length; e += 1)
+        o[e].c();
+      z(t, "class", "tag--container svelte-uq11d5"), f(t, "hide", !a[3].visible || !a[4].visible), f(t, "withAnimation", a[0]);
     },
-    m(i, m) {
-      c(i, t, m);
-      for (let a = 0; a < o.length; a += 1)
-        o[a].m(t, null);
-      n = !0;
+    m(e, n) {
+      c(e, t, n);
+      for (let p = 0; p < o.length; p += 1)
+        o[p].m(t, null);
+      m = !0;
     },
-    p(i, m) {
-      m & 31 && (r = i[1], w(), o = T(o, m, p, 1, i, r, e, t, I, g, null, _), b()), (!n || m & 24) && f(t, "hide", !i[3].visible || !i[4].visible), (!n || m & 1) && f(t, "withAnimation", i[0]);
+    p(e, n) {
+      n & 31 && (r = e[1], w(), o = T(o, n, l, 1, e, r, i, t, I, g, null, _), b()), (!m || n & 24) && f(t, "hide", !e[3].visible || !e[4].visible), (!m || n & 1) && f(t, "withAnimation", e[0]);
     },
-    i(i) {
-      if (!n) {
-        for (let m = 0; m < r.length; m += 1)
-          s(o[m]);
-        n = !0;
+    i(e) {
+      if (!m) {
+        for (let n = 0; n < r.length; n += 1)
+          s(o[n]);
+        m = !0;
       }
     },
-    o(i) {
-      for (let m = 0; m < o.length; m += 1)
-        u(o[m]);
-      n = !1;
+    o(e) {
+      for (let n = 0; n < o.length; n += 1)
+        u(o[n]);
+      m = !1;
     },
-    d(i) {
-      i && h(t);
-      for (let m = 0; m < o.length; m += 1)
-        o[m].d();
+    d(e) {
+      e && h(t);
+      for (let n = 0; n < o.length; n += 1)
+        o[n].d();
     }
   };
 }
-function g(l, t) {
-  let o, e, n;
-  return e = new B({
+function g(a, t) {
+  let o, i, m;
+  return i = new B({
     props: {
       state: t[3],
       temporaryState: t[4],
@@ -133,62 +150,62 @@ function g(l, t) {
       mediaStore: t[2]
     }
   }), {
-    key: l,
+    key: a,
     first: null,
     c() {
-      o = k(), M(e.$$.fragment), this.first = o;
+      o = k(), M(i.$$.fragment), this.first = o;
     },
-    m(r, p) {
-      c(r, o, p), N(e, r, p), n = !0;
+    m(r, l) {
+      c(r, o, l), N(i, r, l), m = !0;
     },
-    p(r, p) {
+    p(r, l) {
       t = r;
-      const i = {};
-      p & 8 && (i.state = t[3]), p & 16 && (i.temporaryState = t[4]), p & 1 && (i.withAnimation = t[0]), p & 2 && (i.tag = t[6]), p & 4 && (i.mediaStore = t[2]), e.$set(i);
+      const e = {};
+      l & 8 && (e.state = t[3]), l & 16 && (e.temporaryState = t[4]), l & 1 && (e.withAnimation = t[0]), l & 2 && (e.tag = t[6]), l & 4 && (e.mediaStore = t[2]), i.$set(e);
     },
     i(r) {
-      n || (s(e.$$.fragment, r), n = !0);
+      m || (s(i.$$.fragment, r), m = !0);
     },
     o(r) {
-      u(e.$$.fragment, r), n = !1;
+      u(i.$$.fragment, r), m = !1;
     },
     d(r) {
-      r && h(o), j(e, r);
+      r && h(o), j(i, r);
     }
   };
 }
-function E(l) {
-  let t, o, e = l[3].enabled && d(l);
+function E(a) {
+  let t, o, i = a[3].enabled && d(a);
   return {
     c() {
-      e && e.c(), t = k();
+      i && i.c(), t = k();
     },
-    m(n, r) {
-      e && e.m(n, r), c(n, t, r), o = !0;
+    m(m, r) {
+      i && i.m(m, r), c(m, t, r), o = !0;
     },
-    p(n, [r]) {
-      n[3].enabled ? e ? (e.p(n, r), r & 8 && s(e, 1)) : (e = d(n), e.c(), s(e, 1), e.m(t.parentNode, t)) : e && (w(), u(e, 1, 1, () => {
-        e = null;
+    p(m, [r]) {
+      m[3].enabled ? i ? (i.p(m, r), r & 8 && s(i, 1)) : (i = d(m), i.c(), s(i, 1), i.m(t.parentNode, t)) : i && (w(), u(i, 1, 1, () => {
+        i = null;
       }), b());
     },
-    i(n) {
-      o || (s(e), o = !0);
+    i(m) {
+      o || (s(i), o = !0);
     },
-    o(n) {
-      u(e), o = !1;
+    o(m) {
+      u(i), o = !1;
     },
-    d(n) {
-      e && e.d(n), n && h(t);
+    d(m) {
+      i && i.d(m), m && h(t);
     }
   };
 }
-function F(l, t, o) {
-  let { withAnimation: e = !1 } = t, { tags: n = [] } = t, { hooks: r } = t, { mediaStore: p } = t, { state: i } = t, { temporaryState: m } = t;
-  return q("hooks", r), l.$$set = (a) => {
-    "withAnimation" in a && o(0, e = a.withAnimation), "tags" in a && o(1, n = a.tags), "hooks" in a && o(5, r = a.hooks), "mediaStore" in a && o(2, p = a.mediaStore), "state" in a && o(3, i = a.state), "temporaryState" in a && o(4, m = a.temporaryState);
-  }, [e, n, p, i, m, r];
+function F(a, t, o) {
+  let { withAnimation: i = !1 } = t, { tags: m = [] } = t, { hooks: r } = t, { mediaStore: l } = t, { state: e } = t, { temporaryState: n } = t;
+  return q("hooks", r), a.$$set = (p) => {
+    "withAnimation" in p && o(0, i = p.withAnimation), "tags" in p && o(1, m = p.tags), "hooks" in p && o(5, r = p.hooks), "mediaStore" in p && o(2, l = p.mediaStore), "state" in p && o(3, e = p.state), "temporaryState" in p && o(4, n = p.temporaryState);
+  }, [i, m, l, e, n, r];
 }
-class re extends S {
+class Si extends S {
   constructor(t) {
     super(), v(
       this,
@@ -209,5 +226,5 @@ class re extends S {
   }
 }
 export {
-  re as default
+  Si as default
 };

package/libs/PanoTagPlugin/Components/TagItem.js

@@ -26,15 +26,32 @@ import "../utils/px2rem.js";
 import "./Tag/ImageTextTag.js";
 import "./Common/Line/Polyline.js";
 import "./Common/Media.js";
-import "../../vendor/swiper/svelte/swiper.js";
+import "../../vendor/svelte-carousel/src/components/Carousel/Carousel.js";
+import "../../vendor/svelte-carousel/src/components/Dots/Dots.js";
+import "../../vendor/svelte-carousel/src/components/Dot/Dot.js";
+import "../../vendor/svelte-carousel/src/components/Arrow/Arrow.js";
+import "../../vendor/svelte-carousel/src/direction.js";
+import "../../vendor/svelte-carousel/src/components/Progress/Progress.js";
+import "../../vendor/svelte-carousel/src/actions/swipeable/swipeable.js";
+import "../../vendor/svelte-carousel/src/actions/swipeable/event.js";
+import "../../vendor/svelte-carousel/src/utils/event.js";
+import "../../vendor/svelte-carousel/src/units.js";
+import "../../vendor/svelte-carousel/src/actions/hoverable/hoverable.js";
+import "../../vendor/svelte-carousel/src/actions/hoverable/event.js";
+import "../../vendor/svelte-carousel/src/actions/tappable/tappable.js";
+import "../../vendor/svelte-carousel/src/utils/math.js";
+import "../../vendor/svelte-carousel/src/actions/tappable/event.js";
+import "../../vendor/svelte-carousel/src/utils/page.js";
+import "../../vendor/svelte-carousel/src/utils/clones.js";
+import "../../vendor/svelte-carousel/src/utils/object.js";
+import "../../vendor/svelte-carousel/src/components/Carousel/createCarousel.js";
+import "simply-reactive";
+import "../../vendor/svelte-carousel/src/utils/lazy.js";
+import "../../vendor/svelte-carousel/src/utils/ProgressManager.js";
+import "../../vendor/svelte-carousel/src/utils/interval.js";
 import "swiper";
-import "../../vendor/swiper/components-shared/get-params.js";
-import "../../vendor/swiper/components-shared/utils.js";
-import "../../vendor/swiper/components-shared/params-list.js";
-import "../../vendor/swiper/components-shared/mount-swiper.js";
-import "../../vendor/swiper/components-shared/get-changed-params.js";
-import "../../vendor/swiper/components-shared/update-swiper.js";
 import "../../vendor/swiper/svelte/swiper-slide.js";
+import "../../vendor/swiper/components-shared/utils.js";
 import "swiper/css";
 import "swiper/css/autoplay";
 import "./Common/MediaItem.js";
@@ -107,12 +124,12 @@ function x(o) {
     c() {
       G(e.$$.fragment);
     },
-    m(i, r) {
-      H(e, i, r), t = !0;
+    m(i, n) {
+      H(e, i, n), t = !0;
     },
-    p(i, r) {
+    p(i, n) {
       const l = {};
-      r & 4 && (l.mediaStore = i[2]), r & 1 && (l.withAnimation = i[0]), r & 2 && (l.tag = F(i[1])), r & 8 && (l.state = i[3]), r & 16 && (l.temporaryState = i[4]), e.$set(l);
+      n & 4 && (l.mediaStore = i[2]), n & 1 && (l.withAnimation = i[0]), n & 2 && (l.tag = F(i[1])), n & 8 && (l.state = i[3]), n & 16 && (l.temporaryState = i[4]), e.$set(l);
     },
     i(i) {
       t || (y(e.$$.fragment, i), t = !0);
@@ -148,12 +165,12 @@ function tt(o) {
     c() {
       G(e.$$.fragment);
     },
-    m(i, r) {
-      H(e, i, r), t = !0;
+    m(i, n) {
+      H(e, i, n), t = !0;
     },
-    p(i, r) {
+    p(i, n) {
       const l = {};
-      r & 2 && (l.tag = i[1]), e.$set(l);
+      n & 2 && (l.tag = i[1]), e.$set(l);
     },
     i(i) {
       t || (y(e.$$.fragment, i), t = !0);
@@ -167,58 +184,58 @@ function tt(o) {
   };
 }
 function et(o) {
-  let e, t, i, r, l, s, u, w, f;
+  let e, t, i, n, l, s, u, w, f;
   const S = [x, Z], c = [];
-  function T(n, p) {
-    return n[12] ? 0 : 1;
+  function T(r, a) {
+    return r[12] ? 0 : 1;
   }
-  i = T(o), r = c[i] = S[i](o);
-  const a = [tt, $], _ = [];
-  function z(n, p) {
-    return n[13] ? 0 : 1;
+  i = T(o), n = c[i] = S[i](o);
+  const p = [tt, $], _ = [];
+  function z(r, a) {
+    return r[13] ? 0 : 1;
   }
-  return s = z(o), u = _[s] = a[s](o), {
+  return s = z(o), u = _[s] = p[s](o), {
     c() {
-      e = A("div"), t = A("div"), r.c(), l = Q(), u.c(), d(t, "class", "wrapper svelte-pzwdws"), d(t, "data-tag-unfolded", o[8]), d(t, "data-tag-id", o[11]), d(t, "data-content-type", w = o[1].contentType), k(t, "left", o[7]), k(t, "top", o[6]), k(t, "z-index", o[5]), d(e, "class", "tag svelte-pzwdws"), d(e, "data-tag-id", o[11]), g(e, "unClickable", o[1].clickable === !1), g(e, "disable", o[10]), g(e, "hide", o[9]), g(e, "withAnimation", o[0]);
+      e = A("div"), t = A("div"), n.c(), l = Q(), u.c(), d(t, "class", "wrapper svelte-pzwdws"), d(t, "data-tag-unfolded", o[8]), d(t, "data-tag-id", o[11]), d(t, "data-content-type", w = o[1].contentType), k(t, "left", o[7]), k(t, "top", o[6]), k(t, "z-index", o[5]), d(e, "class", "tag svelte-pzwdws"), d(e, "data-tag-id", o[11]), g(e, "unClickable", o[1].clickable === !1), g(e, "disable", o[10]), g(e, "hide", o[9]), g(e, "withAnimation", o[0]);
     },
-    m(n, p) {
-      P(n, e, p), j(e, t), c[i].m(t, null), j(t, l), _[s].m(t, null), f = !0;
+    m(r, a) {
+      P(r, e, a), j(e, t), c[i].m(t, null), j(t, l), _[s].m(t, null), f = !0;
     },
-    p(n, [p]) {
+    p(r, [a]) {
       let m = i;
-      i = T(n), i === m ? c[i].p(n, p) : (E(), h(c[m], 1, 1, () => {
+      i = T(r), i === m ? c[i].p(r, a) : (E(), h(c[m], 1, 1, () => {
         c[m] = null;
-      }), B(), r = c[i], r ? r.p(n, p) : (r = c[i] = S[i](n), r.c()), y(r, 1), r.m(t, l));
+      }), B(), n = c[i], n ? n.p(r, a) : (n = c[i] = S[i](r), n.c()), y(n, 1), n.m(t, l));
       let b = s;
-      s = z(n), s === b ? _[s].p(n, p) : (E(), h(_[b], 1, 1, () => {
+      s = z(r), s === b ? _[s].p(r, a) : (E(), h(_[b], 1, 1, () => {
         _[b] = null;
-      }), B(), u = _[s], u ? u.p(n, p) : (u = _[s] = a[s](n), u.c()), y(u, 1), u.m(t, null)), (!f || p & 256) && d(t, "data-tag-unfolded", n[8]), (!f || p & 2048) && d(t, "data-tag-id", n[11]), (!f || p & 2 && w !== (w = n[1].contentType)) && d(t, "data-content-type", w), p & 128 && k(t, "left", n[7]), p & 64 && k(t, "top", n[6]), p & 32 && k(t, "z-index", n[5]), (!f || p & 2048) && d(e, "data-tag-id", n[11]), (!f || p & 2) && g(e, "unClickable", n[1].clickable === !1), (!f || p & 1024) && g(e, "disable", n[10]), (!f || p & 512) && g(e, "hide", n[9]), (!f || p & 1) && g(e, "withAnimation", n[0]);
+      }), B(), u = _[s], u ? u.p(r, a) : (u = _[s] = p[s](r), u.c()), y(u, 1), u.m(t, null)), (!f || a & 256) && d(t, "data-tag-unfolded", r[8]), (!f || a & 2048) && d(t, "data-tag-id", r[11]), (!f || a & 2 && w !== (w = r[1].contentType)) && d(t, "data-content-type", w), a & 128 && k(t, "left", r[7]), a & 64 && k(t, "top", r[6]), a & 32 && k(t, "z-index", r[5]), (!f || a & 2048) && d(e, "data-tag-id", r[11]), (!f || a & 2) && g(e, "unClickable", r[1].clickable === !1), (!f || a & 1024) && g(e, "disable", r[10]), (!f || a & 512) && g(e, "hide", r[9]), (!f || a & 1) && g(e, "withAnimation", r[0]);
     },
-    i(n) {
-      f || (y(r), y(u), f = !0);
+    i(r) {
+      f || (y(n), y(u), f = !0);
     },
-    o(n) {
-      h(r), h(u), f = !1;
+    o(r) {
+      h(n), h(u), f = !1;
     },
-    d(n) {
-      n && C(e), c[i].d(), _[s].d();
+    d(r) {
+      r && C(e), c[i].d(), _[s].d();
     }
   };
 }
 function it(o, e, t) {
-  let i, r, l, s, u, w, f, S, c, { withAnimation: T = !1 } = e, { tag: a } = e, { mediaStore: _ } = e, { state: z } = e, { temporaryState: n } = e;
-  const p = U("hooks");
+  let i, n, l, s, u, w, f, S, c, { withAnimation: T = !1 } = e, { tag: p } = e, { mediaStore: _ } = e, { state: z } = e, { temporaryState: r } = e;
+  const a = U("hooks");
   return o.$$set = (m) => {
-    "withAnimation" in m && t(0, T = m.withAnimation), "tag" in m && t(1, a = m.tag), "mediaStore" in m && t(2, _ = m.mediaStore), "state" in m && t(3, z = m.state), "temporaryState" in m && t(4, n = m.temporaryState);
+    "withAnimation" in m && t(0, T = m.withAnimation), "tag" in m && t(1, p = m.tag), "mediaStore" in m && t(2, _ = m.mediaStore), "state" in m && t(3, z = m.state), "temporaryState" in m && t(4, r = m.temporaryState);
   }, o.$$.update = () => {
     var m, b, L, I, q, D, R, V;
-    o.$$.dirty & 2 && t(13, i = (() => !(a.contentType === "Link" || a.contentType === "VRLink" || a.contentType === "PanoLink" || a.contentType === "Audio" && a.data.appearance === "plane"))()), o.$$.dirty & 2 && t(12, r = (() => a.stickType === "2DPoint")()), o.$$.dirty & 2 && t(11, l = a.id), o.$$.dirty & 2 && t(10, s = !((m = a.pointTagStyle) != null && m.leftPercent) || !((b = a.pointTagStyle) != null && b.topPercent) || a.enabled === !1 || !a.state), o.$$.dirty & 2 && t(9, u = !((L = a.state) != null && L.visible) || ((I = a.temporaryState) == null ? void 0 : I.visible) === !1), o.$$.dirty & 2 && t(8, w = (q = a.state) == null ? void 0 : q.unfolded), o.$$.dirty & 2 && t(7, f = ((D = a.pointTagStyle) == null ? void 0 : D.leftPercent) + "%"), o.$$.dirty & 2 && t(6, S = ((R = a.pointTagStyle) == null ? void 0 : R.topPercent) + "%"), o.$$.dirty & 2 && t(5, c = (V = a.state) != null && V.unfolded ? 1 : 0);
+    o.$$.dirty & 2 && t(13, i = (() => !(p.contentType === "Link" || p.contentType === "VRLink" || p.contentType === "PanoLink" || p.contentType === "Audio" && p.data.appearance === "plane"))()), o.$$.dirty & 2 && t(12, n = (() => p.stickType === "2DPoint")()), o.$$.dirty & 2 && t(11, l = p.id), o.$$.dirty & 2 && t(10, s = !((m = p.pointTagStyle) != null && m.leftPercent) || !((b = p.pointTagStyle) != null && b.topPercent) || p.enabled === !1 || !p.state), o.$$.dirty & 2 && t(9, u = !((L = p.state) != null && L.visible) || ((I = p.temporaryState) == null ? void 0 : I.visible) === !1), o.$$.dirty & 2 && t(8, w = (q = p.state) == null ? void 0 : q.unfolded), o.$$.dirty & 2 && t(7, f = ((D = p.pointTagStyle) == null ? void 0 : D.leftPercent) + "%"), o.$$.dirty & 2 && t(6, S = ((R = p.pointTagStyle) == null ? void 0 : R.topPercent) + "%"), o.$$.dirty & 2 && t(5, c = (V = p.state) != null && V.unfolded ? 1 : 0);
   }, [
     T,
-    a,
+    p,
     _,
     z,
-    n,
+    r,
     c,
     S,
     f,
@@ -226,12 +243,12 @@ function it(o, e, t) {
     u,
     s,
     l,
-    r,
+    n,
     i,
-    p
+    a
   ];
 }
-class Se extends K {
+class He extends K {
   constructor(e) {
     super(), M(
       this,
@@ -251,5 +268,5 @@ class Se extends K {
   }
 }
 export {
-  Se as default
+  He as default
 };