@semiont/react-ui 0.5.29 → 0.5.31

package/dist/index.js

@@ -1269,17 +1269,17 @@ var TextNode = class _TextNode extends Text {
     ), maxChunk = chunk << 1, minChunk = chunk >> 1;
     let chunked = [], currentLines = 0, currentLen = -1, currentChunk = [];
     function add2(child) {
-      let last;
+      let last2;
       if (child.lines > maxChunk && child instanceof _TextNode) {
         for (let node of child.children)
           add2(node);
       } else if (child.lines > minChunk && (currentLines > minChunk || !currentLines)) {
         flush();
         chunked.push(child);
-      } else if (child instanceof TextLeaf && currentLines && (last = currentChunk[currentChunk.length - 1]) instanceof TextLeaf && child.lines + last.lines <= 32) {
+      } else if (child instanceof TextLeaf && currentLines && (last2 = currentChunk[currentChunk.length - 1]) instanceof TextLeaf && child.lines + last2.lines <= 32) {
         currentLines += child.lines;
         currentLen += child.length + 1;
-        currentChunk[currentChunk.length - 1] = new TextLeaf(last.text.concat(child.text), last.length + 1 + child.length);
+        currentChunk[currentChunk.length - 1] = new TextLeaf(last2.text.concat(child.text), last2.length + 1 + child.length);
       } else {
         if (currentLines + child.lines > chunk)
           flush();
@@ -1341,21 +1341,21 @@ var RawTextCursor = class {
   nextInner(skip, dir) {
     this.done = this.lineBreak = false;
     for (; ; ) {
-      let last = this.nodes.length - 1;
-      let top2 = this.nodes[last], offsetValue = this.offsets[last], offset = offsetValue >> 1;
+      let last2 = this.nodes.length - 1;
+      let top2 = this.nodes[last2], offsetValue = this.offsets[last2], offset = offsetValue >> 1;
       let size = top2 instanceof TextLeaf ? top2.text.length : top2.children.length;
       if (offset == (dir > 0 ? size : 0)) {
-        if (last == 0) {
+        if (last2 == 0) {
           this.done = true;
           this.value = "";
           return this;
         }
         if (dir > 0)
-          this.offsets[last - 1]++;
+          this.offsets[last2 - 1]++;
         this.nodes.pop();
         this.offsets.pop();
       } else if ((offsetValue & 1) == (dir > 0 ? 0 : 1)) {
-        this.offsets[last] += dir;
+        this.offsets[last2] += dir;
         if (skip == 0) {
           this.lineBreak = true;
           this.value = "\n";
@@ -1364,7 +1364,7 @@ var RawTextCursor = class {
         skip--;
       } else if (top2 instanceof TextLeaf) {
         let next = top2.text[offset + (dir < 0 ? -1 : 0)];
-        this.offsets[last] += dir;
+        this.offsets[last2] += dir;
         if (next.length > Math.max(0, skip)) {
           this.value = skip == 0 ? next : dir > 0 ? next.slice(skip) : next.slice(0, next.length - skip);
           return this;
@@ -1374,10 +1374,10 @@ var RawTextCursor = class {
         let next = top2.children[offset + (dir < 0 ? -1 : 0)];
         if (skip > next.length) {
           skip -= next.length;
-          this.offsets[last] += dir;
+          this.offsets[last2] += dir;
         } else {
           if (dir < 0)
-            this.offsets[last]--;
+            this.offsets[last2]--;
           this.nodes.push(next);
           this.offsets.push(dir > 0 ? 1 : (next instanceof TextLeaf ? next.text.length : next.children.length) << 1);
         }
@@ -1913,14 +1913,14 @@ var ChangeSet = class _ChangeSet extends ChangeDesc {
 function addSection(sections, len, ins, forceJoin = false) {
   if (len == 0 && ins <= 0)
     return;
-  let last = sections.length - 2;
-  if (last >= 0 && ins <= 0 && ins == sections[last + 1])
-    sections[last] += len;
-  else if (last >= 0 && len == 0 && sections[last] == 0)
-    sections[last + 1] += ins;
+  let last2 = sections.length - 2;
+  if (last2 >= 0 && ins <= 0 && ins == sections[last2 + 1])
+    sections[last2] += len;
+  else if (last2 >= 0 && len == 0 && sections[last2] == 0)
+    sections[last2 + 1] += ins;
   else if (forceJoin) {
-    sections[last] += len;
-    sections[last + 1] += ins;
+    sections[last2] += len;
+    sections[last2 + 1] += ins;
   } else
     sections.push(len, ins);
 }
@@ -3556,7 +3556,7 @@ var Chunk = class _Chunk {
     this.maxPoint = maxPoint;
   }
   get length() {
-    return this.to[this.to.length - 1];
+    return last(this.to);
   }
   // Find the index of the given position and side. Use the ranges'
   // `from` pos when `end == false`, `to` when `end == true`.
@@ -3580,9 +3580,9 @@ var Chunk = class _Chunk {
       if (f11(this.from[i13] + offset, this.to[i13] + offset, this.value[i13]) === false)
         return false;
   }
-  map(offset, changes) {
+  map(offset, changes, basePos, baseSide, spill) {
     let value = [], from = [], to = [], newPos = -1, maxPoint = -1;
-    for (let i13 = 0; i13 < this.value.length; i13++) {
+    iter: for (let i13 = 0; i13 < this.value.length; i13++) {
       let val = this.value[i13], curFrom = this.from[i13] + offset, curTo = this.to[i13] + offset, newFrom, newTo;
       if (curFrom == curTo) {
         let mapped = changes.mapPos(curFrom, val.startSide, val.mapMode);
@@ -3606,9 +3606,27 @@ var Chunk = class _Chunk {
         newPos = newFrom;
       if (val.point)
         maxPoint = Math.max(maxPoint, newTo - newFrom);
-      value.push(val);
-      from.push(newFrom - newPos);
-      to.push(newTo - newPos);
+      if ((newFrom - basePos || val.startSide - baseSide) >= 0) {
+        value.push(val);
+        from.push(newFrom - newPos);
+        to.push(newTo - newPos);
+        basePos = newTo;
+        baseSide = val.endSide;
+      } else {
+        if (newFrom == newTo) {
+          for (let i14 = value.length; i14 > 0; i14--) {
+            if ((newFrom - (to[i14 - 1] + newPos) || val.startSide - value[i14 - 1].endSide) >= 0) {
+              value.splice(i14, 0, val);
+              from.splice(i14, 0, newFrom - newPos);
+              to.splice(i14, 0, newTo - newPos);
+              continue iter;
+            }
+            if ((newFrom - (from[i14 - 1] + newPos) || val.endSide - value[i14 - 1].startSide) > 0)
+              break;
+          }
+        }
+        spill(newFrom, newTo, val);
+      }
     }
     return { mapped: value.length ? new _Chunk(from, to, value, maxPoint) : null, pos: newPos };
   }
@@ -3630,8 +3648,8 @@ var RangeSet = class _RangeSet {
   @internal
   */
   get length() {
-    let last = this.chunk.length - 1;
-    return last < 0 ? 0 : Math.max(this.chunkEnd(last), this.nextLayer.length);
+    let last2 = this.chunk.length - 1;
+    return last2 < 0 ? 0 : Math.max(this.chunkEnd(last2), this.nextLayer.length);
   }
   /**
   The number of ranges in the set.
@@ -3673,13 +3691,13 @@ var RangeSet = class _RangeSet {
     while (cur.value || i13 < add2.length) {
       if (i13 < add2.length && (cur.from - add2[i13].from || cur.startSide - add2[i13].value.startSide) >= 0) {
         let range = add2[i13++];
-        if (!builder.addInner(range.from, range.to, range.value))
+        if (!builder.addInner(range.from, range.to, range.value, false))
           spill.push(range);
       } else if (cur.rangeIndex == 1 && cur.chunkIndex < this.chunk.length && (i13 == add2.length || this.chunkEnd(cur.chunkIndex) < add2[i13].from) && (!filter || filterFrom > this.chunkEnd(cur.chunkIndex) || filterTo < this.chunkPos[cur.chunkIndex]) && builder.addChunk(this.chunkPos[cur.chunkIndex], this.chunk[cur.chunkIndex])) {
         cur.nextChunk();
       } else {
         if (!filter || filterFrom > cur.to || filterTo < cur.from || filter(cur.from, cur.to, cur.value)) {
-          if (!builder.addInner(cur.from, cur.to, cur.value))
+          if (!builder.addInner(cur.from, cur.to, cur.value, false))
             spill.push(Range.create(cur.from, cur.to, cur.value));
         }
         cur.next();
@@ -3694,6 +3712,12 @@ var RangeSet = class _RangeSet {
     if (changes.empty || this.isEmpty)
       return this;
     let chunks = [], chunkPos = [], maxPoint = -1;
+    let spilled;
+    let spill = (from, to, value) => {
+      if (!spilled)
+        spilled = new RangeSetBuilder();
+      spilled.addRange(from, to, value, false);
+    };
     for (let i13 = 0; i13 < this.chunk.length; i13++) {
       let start = this.chunkPos[i13], chunk = this.chunk[i13];
       let touch = changes.touchesRange(start, start + chunk.length);
@@ -3702,7 +3726,8 @@ var RangeSet = class _RangeSet {
         chunks.push(chunk);
         chunkPos.push(changes.mapPos(start));
       } else if (touch === true) {
-        let { mapped, pos } = chunk.map(start, changes);
+        let [prevPos, prevSide] = !chunks.length ? [-1, -1] : [last(chunkPos) + last(chunks).length, last(last(chunks).value).endSide];
+        let { mapped, pos } = chunk.map(start, changes, prevPos, prevSide, spill);
         if (mapped) {
           maxPoint = Math.max(maxPoint, mapped.maxPoint);
           chunks.push(mapped);
@@ -3711,6 +3736,8 @@ var RangeSet = class _RangeSet {
       }
     }
     let next = this.nextLayer.map(changes);
+    if (spilled)
+      next = spilled.finishInner(next);
     return chunks.length == 0 ? next : new _RangeSet(chunkPos, chunks, next || _RangeSet.empty, maxPoint);
   }
   /**
@@ -3833,7 +3860,7 @@ var RangeSet = class _RangeSet {
   static join(sets) {
     if (!sets.length)
       return _RangeSet.empty;
-    let result = sets[sets.length - 1];
+    let result = last(sets);
     for (let i13 = sets.length - 2; i13 >= 0; i13--) {
       for (let layer = sets[i13]; layer != _RangeSet.empty; layer = layer.nextLayer)
         result = new _RangeSet(layer.chunkPos, layer.chunk, result, Math.max(layer.maxPoint, result.maxPoint));
@@ -3842,6 +3869,9 @@ var RangeSet = class _RangeSet {
   }
 };
 RangeSet.empty = /* @__PURE__ */ new RangeSet([], [], null, -1);
+function last(arr) {
+  return arr[arr.length - 1];
+}
 function lazySort(ranges) {
   if (ranges.length > 1)
     for (let prev = ranges[0], i13 = 1; i13 < ranges.length; i13++) {
@@ -3888,15 +3918,21 @@ var RangeSetBuilder = class _RangeSetBuilder {
   `value.startSide`) order.
   */
   add(from, to, value) {
-    if (!this.addInner(from, to, value))
-      (this.nextLayer || (this.nextLayer = new _RangeSetBuilder())).add(from, to, value);
+    this.addRange(from, to, value, true);
+  }
+  /**
+  @internal
+  */
+  addRange(from, to, value, strict) {
+    if (!this.addInner(from, to, value, strict))
+      (this.nextLayer || (this.nextLayer = new _RangeSetBuilder())).addRange(from, to, value, strict);
   }
   /**
   @internal
   */
-  addInner(from, to, value) {
+  addInner(from, to, value, strict) {
     let diff = from - this.lastTo || value.startSide - this.last.endSide;
-    if (diff <= 0 && (from - this.lastFrom || value.startSide - this.last.startSide) < 0)
+    if (strict && diff <= 0 && (from - this.lastFrom || value.startSide - this.last.startSide) < 0)
       throw new Error("Ranges must be added sorted by `from` position and `startSide`");
     if (diff < 0)
       return false;
@@ -3925,10 +3961,10 @@ var RangeSetBuilder = class _RangeSetBuilder {
     this.setMaxPoint = Math.max(this.setMaxPoint, chunk.maxPoint);
     this.chunks.push(chunk);
     this.chunkPos.push(from);
-    let last = chunk.value.length - 1;
-    this.last = chunk.value[last];
-    this.lastFrom = chunk.from[last] + from;
-    this.lastTo = chunk.to[last] + from;
+    let last2 = chunk.value.length - 1;
+    this.last = chunk.value[last2];
+    this.lastFrom = chunk.from[last2] + from;
+    this.lastTo = chunk.to[last2] + from;
     return true;
   }
   /**
@@ -4883,9 +4919,9 @@ function widgetsEq(a15, b8) {
   return a15 == b8 || !!(a15 && b8 && a15.compare(b8));
 }
 function addRange(from, to, ranges, margin = 0) {
-  let last = ranges.length - 1;
-  if (last >= 0 && ranges[last] + margin >= from)
-    ranges[last] = Math.max(ranges[last], to);
+  let last2 = ranges.length - 1;
+  if (last2 >= 0 && ranges[last2] + margin >= from)
+    ranges[last2] = Math.max(ranges[last2], to);
   else
     ranges.push(from, to);
 }
@@ -6326,10 +6362,10 @@ var LineTile = class _LineTile extends CompositeTile {
   }
 };
 function fallbackRect(tile) {
-  let last = tile.dom.lastChild;
-  if (!last)
+  let last2 = tile.dom.lastChild;
+  if (!last2)
     return tile.dom.getBoundingClientRect();
-  let rects = clientRectsFor(last);
+  let rects = clientRectsFor(last2);
   return rects[rects.length - 1] || null;
 }
 function onSameLine(a15, b8) {
@@ -6607,11 +6643,11 @@ var TileBuilder = class {
     let head = line;
     for (let i13 = context.marks.length - 1; i13 >= 0; i13--) {
       let mark = context.marks[i13];
-      let last = head.lastChild;
-      if (last instanceof MarkTile && last.mark.eq(mark.mark)) {
-        if (last.dom != mark.dom)
-          last.setDOM(freeNode(mark.dom));
-        head = last;
+      let last2 = head.lastChild;
+      if (last2 instanceof MarkTile && last2.mark.eq(mark.mark)) {
+        if (last2.dom != mark.dom)
+          last2.setDOM(freeNode(mark.dom));
+        head = last2;
       } else {
         if (this.cache.reused.get(mark)) {
           let tile = Tile.get(mark.dom);
@@ -6699,9 +6735,9 @@ var TileBuilder = class {
     var _a2;
     let parent = this.curLine;
     for (let i13 = marks2.length - 1; i13 >= 0; i13--) {
-      let mark = marks2[i13], last;
-      if (openStart > 0 && (last = parent.lastChild) && last instanceof MarkTile && last.mark.eq(mark)) {
-        parent = last;
+      let mark = marks2[i13], last2;
+      if (openStart > 0 && (last2 = parent.lastChild) && last2 instanceof MarkTile && last2.mark.eq(mark)) {
+        parent = last2;
         openStart--;
       } else {
         let tile = MarkTile.of(mark, (_a2 = this.cache.find(MarkTile, (m6) => m6.mark.eq(mark))) === null || _a2 === void 0 ? void 0 : _a2.dom);
@@ -6715,8 +6751,8 @@ var TileBuilder = class {
   endLine() {
     if (this.curLine) {
       this.flushBuffer();
-      let last = this.curLine.lastChild;
-      if (!last || !hasContent(this.curLine, false) || last.dom.nodeName != "BR" && last.isWidget() && !(browser.ios && hasContent(this.curLine, true)))
+      let last2 = this.curLine.lastChild;
+      if (!last2 || !hasContent(this.curLine, false) || last2.dom.nodeName != "BR" && last2.isWidget() && !(browser.ios && hasContent(this.curLine, true)))
         this.curLine.append(this.cache.findWidget(
           BreakWidget,
           0,
@@ -6755,9 +6791,9 @@ var TileBuilder = class {
     this.updateBlockWrappers();
     let parent = this.root;
     for (let wrap of this.wrappers) {
-      let last = parent.lastChild;
-      if (wrap.from < this.pos && last instanceof BlockWrapperTile && last.wrapper.eq(wrap.wrapper)) {
-        parent = last;
+      let last2 = parent.lastChild;
+      if (wrap.from < this.pos && last2 instanceof BlockWrapperTile && last2.wrapper.eq(wrap.wrapper)) {
+        parent = last2;
       } else {
         let tile = BlockWrapperTile.of(wrap.wrapper, (_a2 = this.cache.find(BlockWrapperTile, (t12) => t12.wrapper.eq(wrap.wrapper))) === null || _a2 === void 0 ? void 0 : _a2.dom);
         parent.append(tile);
@@ -6767,8 +6803,8 @@ var TileBuilder = class {
     return parent;
   }
   blockPosCovered() {
-    let last = this.lastBlock;
-    return last != null && !last.breakAfter && (!last.isWidget() || (last.flags & (32 | 128)) > 0);
+    let last2 = this.lastBlock;
+    return last2 != null && !last2.breakAfter && (!last2.isWidget() || (last2.flags & (32 | 128)) > 0);
   }
   getBuffer(side) {
     let flags = 2 | (side < 0 ? 16 : 32);
@@ -7575,8 +7611,8 @@ var DocView = class {
           result.push(height + spaceAbove);
           spaceAbove = 0;
           if (isWider) {
-            let last = child.dom.lastChild;
-            let rects = last ? clientRectsFor(last) : [];
+            let last2 = child.dom.lastChild;
+            let rects = last2 ? clientRectsFor(last2) : [];
             if (rects.length) {
               let rect = rects[rects.length - 1];
               let width = ltr ? rect.right - childRect.left : childRect.right - rect.left;
@@ -8184,7 +8220,7 @@ var InlineCoordsScan = class {
     }
     if (!closestRect) {
       if (!below && !above)
-        return { i: positions[0], after: false };
+        return { i: 0, after: false };
       let side = above && (!below || this.y - above.bottom < below.top - this.y) ? above : below;
       this.y = (side.top + side.bottom) / 2;
       return this.scan(positions, getRects, true);
@@ -8741,7 +8777,7 @@ var InputState = class {
       if (mods.shiftKey && browser.ios && !/^(off|none)$/.test(this.view.contentDOM.autocapitalize) && iosVirtualKeyboardOpen(this.view.win))
         mods.shiftKey = false;
       this.pendingIOSKey = { key: event.key, keyCode: event.keyCode, mods };
-      setTimeout(() => this.flushIOSKey(), 250);
+      setTimeout(() => this.flushIOSKey(), 50);
       return true;
     }
     if (event.keyCode != 229)
@@ -8750,7 +8786,7 @@ var InputState = class {
   }
   flushIOSKey(change) {
     let key = this.pendingIOSKey;
-    if (!key)
+    if (!key || this.view.observer.pendingRecords().length)
       return false;
     if (key.key == "Enter" && change && change.from < change.to && /^\S+$/.test(change.insert.toString()))
       return false;
@@ -9114,10 +9150,10 @@ var lastMouseDownTime = 0;
 function getClickType(event) {
   if (!BadMouseDetail)
     return event.detail;
-  let last = lastMouseDown, lastTime = lastMouseDownTime;
+  let last2 = lastMouseDown, lastTime = lastMouseDownTime;
   lastMouseDown = event;
   lastMouseDownTime = Date.now();
-  return lastMouseDownCount = !last || lastTime > Date.now() - 400 && Math.abs(last.clientX - event.clientX) < 2 && Math.abs(last.clientY - event.clientY) < 2 ? (lastMouseDownCount + 1) % 3 : 1;
+  return lastMouseDownCount = !last2 || lastTime > Date.now() - 400 && Math.abs(last2.clientX - event.clientX) < 2 && Math.abs(last2.clientY - event.clientY) < 2 ? (lastMouseDownCount + 1) % 3 : 1;
 }
 function basicMouseSelection(view, event) {
   let start = view.posAndSideAtCoords({ x: event.clientX, y: event.clientY }, false), type = getClickType(event);
@@ -9809,9 +9845,9 @@ var HeightMapGap = class _HeightMapGap extends HeightMap {
   replace(from, to, nodes) {
     let after = this.length - to;
     if (after > 0) {
-      let last = nodes[nodes.length - 1];
-      if (last instanceof _HeightMapGap)
-        nodes[nodes.length - 1] = new _HeightMapGap(last.length + after);
+      let last2 = nodes[nodes.length - 1];
+      if (last2 instanceof _HeightMapGap)
+        nodes[nodes.length - 1] = new _HeightMapGap(last2.length + after);
       else
         nodes.push(null, new _HeightMapGap(after - 1));
     }
@@ -10009,9 +10045,9 @@ var NodeBuilder = class _NodeBuilder {
   }
   span(_from, to) {
     if (this.lineStart > -1) {
-      let end = Math.min(to, this.lineEnd), last = this.nodes[this.nodes.length - 1];
-      if (last instanceof HeightMapText)
-        last.length += end - this.pos;
+      let end = Math.min(to, this.lineEnd), last2 = this.nodes[this.nodes.length - 1];
+      if (last2 instanceof HeightMapText)
+        last2.length += end - this.pos;
       else if (end > this.pos || !this.isCovered)
         this.nodes.push(new HeightMapText(end - this.pos, -1, 0));
       this.writtenTo = end;
@@ -10064,9 +10100,9 @@ var NodeBuilder = class _NodeBuilder {
   }
   ensureLine() {
     this.enterLine();
-    let last = this.nodes.length ? this.nodes[this.nodes.length - 1] : null;
-    if (last instanceof HeightMapText)
-      return last;
+    let last2 = this.nodes.length ? this.nodes[this.nodes.length - 1] : null;
+    if (last2 instanceof HeightMapText)
+      return last2;
     let line = new HeightMapText(0, -1, 0);
     this.nodes.push(line);
     return line;
@@ -10090,10 +10126,10 @@ var NodeBuilder = class _NodeBuilder {
     this.writtenTo = this.pos = this.pos + length;
   }
   finish(from) {
-    let last = this.nodes.length == 0 ? null : this.nodes[this.nodes.length - 1];
-    if (this.lineStart > -1 && !(last instanceof HeightMapText) && !this.isCovered)
+    let last2 = this.nodes.length == 0 ? null : this.nodes[this.nodes.length - 1];
+    if (this.lineStart > -1 && !(last2 instanceof HeightMapText) && !this.isCovered)
       this.nodes.push(new HeightMapText(0, -1, 0));
-    else if (this.writtenTo < this.pos || last == null)
+    else if (this.writtenTo < this.pos || last2 == null)
       this.nodes.push(this.blankContent(this.writtenTo, this.pos));
     let pos = from;
     for (let node of this.nodes) {
@@ -10626,8 +10662,7 @@ var ViewState = class {
     return height >= this.viewportLines[0].top && height <= this.viewportLines[this.viewportLines.length - 1].bottom && this.viewportLines.find((l10) => l10.top <= height && l10.bottom >= height) || scaleBlock(this.heightMap.lineAt(this.scaler.fromDOM(height), QueryType.ByHeight, this.heightOracle, 0, 0), this.scaler);
   }
   getScrollOffset() {
-    let base2 = this.scrollParent == this.view.scrollDOM ? this.scrollParent.scrollTop : (this.scrollParent ? this.scrollParent.getBoundingClientRect().top : 0) - this.view.contentDOM.getBoundingClientRect().top;
-    return base2 * this.scaleY;
+    return this.scrollParent == this.view.scrollDOM ? this.scrollParent.scrollTop * this.scaleY : (this.scrollParent ? this.scrollParent.getBoundingClientRect().top : 0) - this.view.contentDOM.getBoundingClientRect().top;
   }
   scrollAnchorAt(scrollOffset) {
     let block = this.lineBlockAtHeight(scrollOffset + 8);
@@ -11026,8 +11061,9 @@ var baseTheme$1 = /* @__PURE__ */ buildTheme("." + baseThemeID, {
     userSelect: "none"
   },
   ".cm-highlightSpace": {
-    backgroundImage: "radial-gradient(circle at 50% 55%, #aaa 20%, transparent 5%)",
-    backgroundPosition: "center"
+    background: "radial-gradient(circle at 50% 55%, #aaa 20%, transparent 0) no-repeat",
+    backgroundSize: ".4em",
+    backgroundPosition: "calc(min(50%, 0px)) center"
   },
   ".cm-highlightTab": {
     backgroundImage: `url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="200" height="20"><path stroke="%23888" stroke-width="1" fill="none" d="M1 10H196L190 5M190 15L196 10M197 4L197 16"/></svg>')`,
@@ -12033,7 +12069,7 @@ var EditorView = class _EditorView {
       this.observer.forceFlush();
     let updated = null;
     let scroll = this.viewState.scrollParent, scrollOffset = this.viewState.getScrollOffset();
-    let { scrollAnchorPos, scrollAnchorHeight } = this.viewState;
+    let { scrollAnchorPos, scrollAnchorHeight, scaleY: scrollScale } = this.viewState;
     if (Math.abs(scrollOffset - this.viewState.scrollOffset) > 1)
       scrollAnchorHeight = -1;
     this.viewState.scrollAnchorHeight = -1;
@@ -12042,12 +12078,13 @@ var EditorView = class _EditorView {
         if (scrollAnchorHeight < 0) {
           if (isScrolledToBottom(scroll || this.win)) {
             scrollAnchorPos = -1;
-            scrollAnchorHeight = this.viewState.heightMap.height;
+            scrollAnchorHeight = this.viewState.heightMap.height / this.viewState.scaleY;
           } else {
             let block = this.viewState.scrollAnchorAt(scrollOffset);
             scrollAnchorPos = block.from;
             scrollAnchorHeight = block.top;
           }
+          scrollScale = this.viewState.scaleY;
         }
         this.updateState = 1;
         let changed = this.viewState.measure();
@@ -12104,7 +12141,7 @@ var EditorView = class _EditorView {
               continue;
             } else {
               let newAnchorHeight = scrollAnchorPos < 0 ? this.viewState.heightMap.height : this.viewState.lineBlockAt(scrollAnchorPos).top;
-              let diff = (newAnchorHeight - scrollAnchorHeight) / this.scaleY;
+              let diff = newAnchorHeight / this.viewState.scaleY - scrollAnchorHeight / scrollScale;
               if ((diff > 1 || diff < -1) && !(browser.ios && this.inputState.lastIOSMomentumScroll > Date.now() - 100) && (scroll == this.scrollDOM || this.hasFocus || Math.max(this.inputState.lastWheelEvent, this.inputState.lastTouchTime) > Date.now() - 100)) {
                 scrollOffset = scrollOffset + diff;
                 if (!scroll)
@@ -13222,9 +13259,9 @@ var UpdateContext = class {
   finish() {
     let gutter2 = this.gutter;
     while (gutter2.elements.length > this.i) {
-      let last = gutter2.elements.pop();
-      gutter2.dom.removeChild(last.dom);
-      last.destroy();
+      let last2 = gutter2.elements.pop();
+      gutter2.dom.removeChild(last2.dom);
+      last2.destroy();
     }
   }
 };
@@ -13415,10 +13452,10 @@ function lineNumbers(config = {}) {
   ];
 }
 function maxLineNumber(lines) {
-  let last = 9;
-  while (last < lines)
-    last = last * 10 + 9;
-  return last;
+  let last2 = 9;
+  while (last2 < lines)
+    last2 = last2 * 10 + 9;
+  return last2;
 }
 
 // ../../node_modules/@lezer/common/dist/index.js
@@ -13961,14 +13998,14 @@ var BaseNode = class {
   enterUnfinishedNodesBefore(pos) {
     let scan = this.childBefore(pos), node = this;
     while (scan) {
-      let last = scan.lastChild;
-      if (!last || last.to != scan.to)
+      let last2 = scan.lastChild;
+      if (!last2 || last2.to != scan.to)
         break;
-      if (last.type.isError && last.from == last.to) {
+      if (last2.type.isError && last2.from == last2.to) {
         node = scan;
-        scan = last.prevSibling;
+        scan = last2.prevSibling;
       } else {
-        scan = last;
+        scan = last2;
       }
     }
     return node;
@@ -14764,12 +14801,12 @@ function buildTree(data2) {
   }
   function makeBalanced(type, contextHash2) {
     return (children2, positions2, length2) => {
-      let lookAhead2 = 0, lastI = children2.length - 1, last, lookAheadProp;
-      if (lastI >= 0 && (last = children2[lastI]) instanceof Tree) {
-        if (!lastI && last.type == type && last.length == length2)
-          return last;
-        if (lookAheadProp = last.prop(NodeProp.lookAhead))
-          lookAhead2 = positions2[lastI] + last.length + lookAheadProp;
+      let lookAhead2 = 0, lastI = children2.length - 1, last2, lookAheadProp;
+      if (lastI >= 0 && (last2 = children2[lastI]) instanceof Tree) {
+        if (!lastI && last2.type == type && last2.length == length2)
+          return last2;
+        if (lookAheadProp = last2.prop(NodeProp.lookAhead))
+          lookAhead2 = positions2[lastI] + last2.length + lookAheadProp;
       }
       return makeTree(type, children2, positions2, length2, lookAhead2, contextHash2);
     };
@@ -15226,9 +15263,9 @@ var MixedParse = class {
         if (range === true)
           range = new Range2(cursor2.from, cursor2.to);
         if (range.from < range.to) {
-          let last = overlay.ranges.length - 1;
-          if (last >= 0 && overlay.ranges[last].to == range.from)
-            overlay.ranges[last] = { from: overlay.ranges[last].from, to: range.to };
+          let last2 = overlay.ranges.length - 1;
+          if (last2 >= 0 && overlay.ranges[last2].to == range.from)
+            overlay.ranges[last2] = { from: overlay.ranges[last2].from, to: range.to };
           else
             overlay.ranges.push(range);
         }
@@ -15458,10 +15495,10 @@ function enterFragments(mounts, ranges) {
       let overlay = mount.overlay.map((r13) => new Range2(r13.from + pos, r13.to + pos));
       let changes = findCoverChanges(ranges, overlay, from, to);
       for (let i13 = 0, pos2 = from; ; i13++) {
-        let last = i13 == changes.length, end = last ? to : changes[i13].from;
+        let last2 = i13 == changes.length, end = last2 ? to : changes[i13].from;
         if (end > pos2)
           result.push(new TreeFragment(pos2, end, mount.tree, -startPos, frag.from >= pos2 || frag.openStart, frag.to <= end || frag.openEnd));
-        if (last)
+        if (last2)
           break;
         pos2 = changes[i13].to;
       }
@@ -15592,10 +15629,10 @@ function styleTags(spec) {
             throw new RangeError("Invalid path: " + part);
           rest = part.slice(pos);
         }
-        let last = pieces.length - 1, inner = pieces[last];
+        let last2 = pieces.length - 1, inner = pieces[last2];
         if (!inner)
           throw new RangeError("Invalid path: " + part);
-        let rule = new Rule(tags3, mode, last > 0 ? pieces.slice(0, last) : null);
+        let rule = new Rule(tags3, mode, last2 > 0 ? pieces.slice(0, last2) : null);
         byName[inner] = rule.sort(byName[inner]);
       }
   }
@@ -16816,7 +16853,7 @@ var indentUnit = /* @__PURE__ */ Facet.define({
 var indentNodeProp = /* @__PURE__ */ new NodeProp();
 function bracketedAligned(context) {
   let tree = context.node;
-  let openToken = tree.childAfter(tree.from), last = tree.lastChild;
+  let openToken = tree.childAfter(tree.from), last2 = tree.lastChild;
   if (!openToken)
     return null;
   let sim = context.options.simulateBreak;
@@ -16824,7 +16861,7 @@ function bracketedAligned(context) {
   let lineEnd2 = sim == null || sim <= openLine.from ? openLine.to : Math.min(openLine.to, sim);
   for (let pos = openToken.to; ; ) {
     let next = tree.childAfter(pos);
-    if (!next || next == last)
+    if (!next || next == last2)
       return null;
     if (!next.type.isSkipped) {
       if (next.from >= lineEnd2)
@@ -16856,8 +16893,8 @@ function continuedIndent({ except, units = 1 } = {}) {
 var foldService = /* @__PURE__ */ Facet.define();
 var foldNodeProp = /* @__PURE__ */ new NodeProp();
 function foldInside(node) {
-  let first = node.firstChild, last = node.lastChild;
-  return first && first.to < last.from ? { from: first.to, to: last.type.isError ? node.to : last.from } : null;
+  let first = node.firstChild, last2 = node.lastChild;
+  return first && first.to < last2.from ? { from: first.to, to: last2.type.isError ? node.to : last2.from } : null;
 }
 var HighlightStyle = class _HighlightStyle {
   constructor(specs, options) {
@@ -17385,9 +17422,9 @@ function resolveAnnotationSpans(annotations, offsetMap) {
   for (const annotation of annotations) {
     if (annotation.length <= 0) continue;
     const start = offsetMap.get(annotation.offset);
-    const last = offsetMap.get(annotation.offset + annotation.length - 1);
-    if (start === void 0 || last === void 0 || last < start) continue;
-    spans.push({ annotation, start, end: last + 1 });
+    const last2 = offsetMap.get(annotation.offset + annotation.length - 1);
+    if (start === void 0 || last2 === void 0 || last2 < start) continue;
+    spans.push({ annotation, start, end: last2 + 1 });
   }
   return spans;
 }
@@ -19217,10 +19254,10 @@ function moveField(dir) {
     let active = state.field(snippetState, false);
     if (!active || dir < 0 && active.active == 0)
       return false;
-    let next = active.active + dir, last = dir > 0 && !active.ranges.some((r13) => r13.field == next + dir);
+    let next = active.active + dir, last2 = dir > 0 && !active.ranges.some((r13) => r13.field == next + dir);
     dispatch(state.update({
       selection: fieldSelection(active.ranges, next),
-      effects: setActive.of(last ? null : new ActiveSnippet(active.ranges, next)),
+      effects: setActive.of(last2 ? null : new ActiveSnippet(active.ranges, next)),
       scrollIntoView: true
     }));
     return true;
@@ -19293,9 +19330,9 @@ var CompositeBlock = class _CompositeBlock {
     this.positions.push(pos);
   }
   toTree(nodeSet, end = this.end) {
-    let last = this.children.length - 1;
-    if (last >= 0)
-      end = Math.max(end, this.positions[last] + this.children[last].length + this.from);
+    let last2 = this.children.length - 1;
+    if (last2 >= 0)
+      end = Math.max(end, this.positions[last2] + this.children[last2].length + this.from);
     return new Tree(nodeSet.types[this.type], this.children, this.positions, end - this.from).balance({
       makeTree: (children, positions, length) => new Tree(NodeType.none, children, positions, length, this.hashProp)
     });
@@ -19609,9 +19646,9 @@ function getListIndent(line, pos) {
   return indented >= indentAfter + 5 || skipped == line.text.length ? indentAfter + 1 : indented;
 }
 function addCodeText(marks2, from, to) {
-  let last = marks2.length - 1;
-  if (last >= 0 && marks2[last].to == from && marks2[last].type == Type.CodeText)
-    marks2[last].to = to;
+  let last2 = marks2.length - 1;
+  if (last2 >= 0 && marks2[last2].to == from && marks2[last2].type == Type.CodeText)
+    marks2[last2].to = to;
   else
     marks2.push(elt(Type.CodeText, from, to));
 }
@@ -21230,10 +21267,10 @@ function autolinkURLEnd(text, from) {
     return -1;
   let end = from + m6[0].length;
   for (; ; ) {
-    let last = text[end - 1], m7;
-    if (/[?!.,:*_~]/.test(last) || last == ")" && count(text, from, end, ")") > count(text, from, end, "("))
+    let last2 = text[end - 1], m7;
+    if (/[?!.,:*_~]/.test(last2) || last2 == ")" && count(text, from, end, ")") > count(text, from, end, "("))
       end--;
-    else if (last == ";" && (m7 = /&(?:#\d+|#x[a-f\d]+|\w+);$/.exec(text.slice(from, end))))
+    else if (last2 == ";" && (m7 = /&(?:#\d+|#x[a-f\d]+|\w+);$/.exec(text.slice(from, end))))
       end = from + m7.index;
     else
       break;
@@ -21245,8 +21282,8 @@ function autolinkEmailEnd(text, from) {
   let m6 = emailRE.exec(text);
   if (!m6)
     return -1;
-  let last = m6[0][m6[0].length - 1];
-  return last == "_" || last == "-" ? -1 : from + m6[0].length - (last == "." ? 1 : 0);
+  let last2 = m6[0][m6[0].length - 1];
+  return last2 == "_" || last2 == "-" ? -1 : from + m6[0].length - (last2 == "." ? 1 : 0);
 }
 var Autolink = {
   parseInline: [{
@@ -21773,16 +21810,16 @@ var Stack = class _Stack {
   @internal
   */
   emitContext() {
-    let last = this.buffer.length - 1;
-    if (last < 0 || this.buffer[last] != -3)
+    let last2 = this.buffer.length - 1;
+    if (last2 < 0 || this.buffer[last2] != -3)
       this.buffer.push(this.curContext.hash, this.pos, this.pos, -3);
   }
   /**
   @internal
   */
   emitLookAhead() {
-    let last = this.buffer.length - 1;
-    if (last < 0 || this.buffer[last] != -4)
+    let last2 = this.buffer.length - 1;
+    if (last2 < 0 || this.buffer[last2] != -4)
       this.buffer.push(this.lookAhead, this.pos, this.pos, -4);
   }
   updateContext(context) {
@@ -22303,12 +22340,12 @@ var FragmentCursor3 = class {
     if (!this.fragment)
       return null;
     for (; ; ) {
-      let last = this.trees.length - 1;
-      if (last < 0) {
+      let last2 = this.trees.length - 1;
+      if (last2 < 0) {
         this.nextFragment();
         return null;
       }
-      let top2 = this.trees[last], index = this.index[last];
+      let top2 = this.trees[last2], index = this.index[last2];
       if (index == top2.children.length) {
         this.trees.pop();
         this.start.pop();
@@ -22316,7 +22353,7 @@ var FragmentCursor3 = class {
         continue;
       }
       let next = top2.children[index];
-      let start = this.start[last] + top2.positions[index];
+      let start = this.start[last2] + top2.positions[index];
       if (start > pos) {
         this.nextStart = start;
         return null;
@@ -22332,14 +22369,14 @@ var FragmentCursor3 = class {
               return next;
           }
         }
-        this.index[last]++;
+        this.index[last2]++;
         if (start + next.length >= Math.max(this.safeFrom, pos)) {
           this.trees.push(next);
           this.start.push(start);
           this.index.push(0);
         }
       } else {
-        this.index[last]++;
+        this.index[last2]++;
         this.nextStart = start + next.length;
       }
     }
@@ -22640,8 +22677,8 @@ var Parse = class {
     let actions = this.tokens.getActions(stack);
     for (let i13 = 0; i13 < actions.length; ) {
       let action = actions[i13++], term = actions[i13++], end = actions[i13++];
-      let last = i13 == actions.length || !split;
-      let localStack = last ? stack : stack.split();
+      let last2 = i13 == actions.length || !split;
+      let localStack = last2 ? stack : stack.split();
       let main = this.tokens.mainToken;
       localStack.apply(action, term, main ? main.start : localStack.pos, end);
       if (verbose)
@@ -22649,7 +22686,7 @@ var Parse = class {
           action & 65535
           /* Action.ValueMask */
         )}`} for ${parser6.getName(term)} @ ${start}${localStack == stack ? "" : ", split"})`);
-      if (last)
+      if (last2)
         return true;
       else if (localStack.pos > start)
         stacks.push(localStack);
@@ -22858,14 +22895,14 @@ var LRParser = class _LRParser extends Parser {
     if (term >= table[0])
       return -1;
     for (let pos = table[term + 1]; ; ) {
-      let groupTag = table[pos++], last = groupTag & 1;
+      let groupTag = table[pos++], last2 = groupTag & 1;
       let target = table[pos++];
-      if (last && loose)
+      if (last2 && loose)
         return target;
       for (let end = pos + (groupTag >> 1); pos < end; pos++)
         if (table[pos] == state)
           return target;
-      if (last)
+      if (last2)
         return -1;
     }
   }
@@ -23428,7 +23465,7 @@ function configureNesting(tags3 = [], attributes = []) {
           let value = n12.lastChild;
           if (value.type.id == AttributeValue) {
             let from = value.from + 1;
-            let last = value.lastChild, to = value.to - (last && last.isError ? 0 : 1);
+            let last2 = value.lastChild, to = value.to - (last2 && last2.isError ? 0 : 1);
             if (to > from) return { parser: attr.parser, overlay: [{ from, to }], bracketed: true };
           } else if (value.type.id == UnquotedAttributeValue) {
             return { parser: attr.parser, overlay: [{ from: value.from, to: value.to }] };
@@ -25546,11 +25583,11 @@ function completeAttrValue(state, schema, tree, from, to) {
 function htmlCompletionFor(schema, context) {
   let { state, pos } = context, tree = syntaxTree(state).resolveInner(pos, -1), around = tree.resolve(pos);
   for (let scan = pos, before; around == tree && (before = tree.childBefore(scan)); ) {
-    let last = before.lastChild;
-    if (!last || !last.type.isError || last.from < last.to)
+    let last2 = before.lastChild;
+    if (!last2 || !last2.type.isError || last2.from < last2.to)
       break;
     around = tree = before;
-    scan = last.from;
+    scan = last2.from;
   }
   if (tree.name == "TagName") {
     return tree.parent && /CloseTag$/.test(tree.parent.name) ? completeCloseTag(state, tree, tree.from, pos) : completeTag(state, schema, tree, tree.from, pos);
@@ -25640,10 +25677,10 @@ var htmlPlain = /* @__PURE__ */ LRLanguage.define({
             return context.continue();
           let endElt = null, close;
           for (let cur = context.node; ; ) {
-            let last = cur.lastChild;
-            if (!last || last.name != "Element" || last.to != cur.to)
+            let last2 = cur.lastChild;
+            if (!last2 || last2.name != "Element" || last2.to != cur.to)
               break;
-            endElt = cur = last;
+            endElt = cur = last2;
           }
           if (endElt && !((close = endElt.lastChild) && (close.name == "CloseTag" || close.name == "SelfClosingTag")))
             return context.lineIndent(endElt.from) + context.unit;
@@ -25652,10 +25689,10 @@ var htmlPlain = /* @__PURE__ */ LRLanguage.define({
       }),
       /* @__PURE__ */ foldNodeProp.add({
         Element(node) {
-          let first = node.firstChild, last = node.lastChild;
+          let first = node.firstChild, last2 = node.lastChild;
           if (!first || first.name != "OpenTag")
             return null;
-          return { from: first.to, to: last.name == "CloseTag" ? last.from : node.to };
+          return { from: first.to, to: last2.name == "CloseTag" ? last2.from : node.to };
         }
       }),
       /* @__PURE__ */ bracketMatchingHandle.add({
@@ -25765,14 +25802,14 @@ function isList(type) {
   return type.name == "OrderedList" || type.name == "BulletList";
 }
 function findSectionEnd(headerNode, level) {
-  let last = headerNode;
+  let last2 = headerNode;
   for (; ; ) {
-    let next = last.nextSibling, heading2;
+    let next = last2.nextSibling, heading2;
     if (!next || (heading2 = isHeading(next.type)) != null && heading2 <= level)
       break;
-    last = next;
+    last2 = next;
   }
-  return last.to;
+  return last2.to;
 }
 var headerIndent = /* @__PURE__ */ foldService.of((state, start, end) => {
   for (let node = syntaxTree(state).resolveInner(end, -1); node; node = node.parent) {
@@ -44178,7 +44215,7 @@ import { createMarkStateUnit } from "@semiont/sdk";
 import { createGatherStateUnit } from "@semiont/sdk";
 import { createMatchStateUnit } from "@semiont/sdk";
 import { createYieldStateUnit } from "@semiont/sdk";
-import { decodeWithCharset as decodeWithCharset2, textExtractionOf, uuidV4 as uuidV42 } from "@semiont/core";
+import { decodeWithCharset as decodeWithCharset2, textSourceOf, uuidV4 as uuidV42 } from "@semiont/core";
 var WIZARD_CLOSED = {
   open: false,
   annotationId: null,
@@ -44212,7 +44249,7 @@ function createResourceViewerPageStateUnit(session, resourceId2, locale, browse,
   const contentLoading$ = new import_rxjs3.BehaviorSubject(false);
   const mediaToken$ = new import_rxjs3.BehaviorSubject(null);
   const mediaType = options?.mediaType || "text/plain";
-  const isBinaryType = textExtractionOf(mediaType) !== "decode";
+  const isBinaryType = textSourceOf(mediaType) !== "decode";
   if (!isBinaryType && mediaType) {
     contentLoading$.next(true);
     client.browse.resourceRepresentation(resourceId2).then(({ data: data2, contentType }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@semiont/react-ui",
-  "version": "0.5.29",
+  "version": "0.5.31",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -95,15 +95,15 @@
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",
     "@types/react": "^19.2.18",
-    "@types/react-dom": "^19.2.5",
+    "@types/react-dom": "^19.2.7",
     "@vitest/coverage-v8": "^4.1.11",
     "autoprefixer": "^10.5.4",
     "axe-core": "^4.12.1",
     "cssnano": "^8.0.8",
     "fast-check": "^4.9.0",
     "jest-axe": "^11.0.0",
-    "jsdom": "^29.1.1",
-    "postcss-import": "^16.2.0",
+    "jsdom": "^30.0.0",
+    "postcss-import": "^17.0.0",
     "rollup": "^4.63.0",
     "rollup-plugin-dts": "^6.4.1",
     "styled-components": "^6.5.2",
@@ -122,12 +122,12 @@
     "directory": "packages/react-ui"
   },
   "dependencies": {
-    "@semiont/core": "0.5.29",
-    "@semiont/http-transport": "0.5.29",
-    "@semiont/sdk": "0.5.29",
+    "@semiont/core": "0.5.31",
+    "@semiont/http-transport": "0.5.31",
+    "@semiont/sdk": "0.5.31",
     "clsx": "^2.1.1",
     "pdfjs-dist": "^6.2.108",
-    "react-error-boundary": "^6.1.3",
+    "react-error-boundary": "^6.1.4",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
     "use-sync-external-store": "^1.6.0"

package/src/components/resource/__tests__/ResourceViewer.embeddable.test.tsx

@@ -59,6 +59,7 @@ const loadedHighlight: Annotation = {
   type: 'Annotation',
   id: annotationId('ann-1'),
   motivation: 'highlighting',
+  created: '2026-01-01T00:00:00.000Z',
   target: { source: 'res-1', selector: { type: 'TextPositionSelector', start: 0, end: 10 } },
 };
 

package/src/features/moderate-recent/__tests__/RecentDocumentsPage.test.tsx

@@ -368,8 +368,8 @@ describe('RecentDocumentsPage', () => {
       const props = createMockProps();
       const { container } = render(<RecentDocumentsPage {...props} />);
 
-      const svg = container.querySelector('svg[viewBox="0 0 24 24"]');
-      expect(svg).toBeInTheDocument();
+      const svg = container.querySelector('svg[viewBox]');
+      expect(svg).toHaveAttribute('viewBox', '0 0 24 24');
     });
 
     it('renders SVG path with correct attributes', () => {

package/src/features/resource-viewer/state/__tests__/resource-viewer-page-state-unit.test.ts

@@ -152,7 +152,7 @@ describe('createResourceViewerPageStateUnit', () => {
     stateUnit.dispose();
   });
 
-  // isBinaryType keys off textExtractionOf(...) !== 'decode', not render mode:
+  // isBinaryType keys off textSourceOf(...) !== 'decode', not render mode:
   // storage-tier binary (ZIP, gif/webp) must be fetched as bytes, never
   // decoded as text — the client-side twin of the Phase 3a serving-side fix.
   it('fetches storage-tier binary (ZIP) as bytes, never the text-decode path', async () => {

package/src/features/resource-viewer/state/resource-viewer-page-state-unit.ts

@@ -10,7 +10,7 @@ import { createGatherStateUnit, type GatherStateUnit } from '@semiont/sdk';
 import { createMatchStateUnit } from '@semiont/sdk';
 import { createYieldStateUnit, type YieldStateUnit } from '@semiont/sdk';
 import type { SemiontSession } from '@semiont/sdk';
-import { decodeWithCharset, textExtractionOf, uuidV4 } from '@semiont/core';
+import { decodeWithCharset, textSourceOf, uuidV4 } from '@semiont/core';
 import { groupAnnotations } from '../../../lib/annotation-groups';
 import type { ReferencedByEntry } from '@semiont/sdk';
 
@@ -109,7 +109,7 @@ export function createResourceViewerPageStateUnit(
   // type does not decode to text. Storage-tier images (gif/webp) are
   // render:'none' but still binary, and a ZIP must avoid the text path; a
   // mechanical render-mode check would mis-route both into mojibake.
-  const isBinaryType = textExtractionOf(mediaType) !== 'decode';
+  const isBinaryType = textSourceOf(mediaType) !== 'decode';
 
   if (!isBinaryType && mediaType) {
     contentLoading$.next(true);