@aiquants/spreadsheet 0.18.0 → 0.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +36 -0
- package/README.md +3 -3
- package/dist/index.cjs +8 -8
- package/dist/index.js +3192 -3185
- package/dist/styles/spreadsheet.css +1 -1
- package/dist/styles/spreadsheet.standalone.css +1 -1
- package/package.json +1 -1
- package/src/overlay/SelectionOverlay.tsx +175 -95
- package/src/styles/spreadsheet.css +4 -0
|
@@ -258,17 +258,20 @@ const NO_TRACKS: readonly [number, number] = Object.freeze([0, -1] as const)
|
|
|
258
258
|
export type FrameSpan = { near: number; far: number; nearOpen: boolean; farOpen: boolean }
|
|
259
259
|
|
|
260
260
|
/**
|
|
261
|
-
*
|
|
262
|
-
*
|
|
263
|
-
*
|
|
264
|
-
*
|
|
265
|
-
*
|
|
266
|
-
*
|
|
267
|
-
*
|
|
268
|
-
*
|
|
269
|
-
*
|
|
270
|
-
*
|
|
261
|
+
* Resolves one axis of a frame inside one layer into `span` (v0.18) and answers whether the layer frames anything on
|
|
262
|
+
* it: false when the layer paints none of the range on this axis or the range lies wholly beyond the layer's ± 1 screen
|
|
263
|
+
* margin (`span` is then left as it was). The layer paints the tracks `first..last`; a side whose range edge lies
|
|
264
|
+
* before `first` or after `last` continues into another pane (or past the axis's scrolled-away part), so it is pushed
|
|
265
|
+
* to the margin's edge and marked open — every pane frames only the cells it paints and the panes join into one frame
|
|
266
|
+
* without a seam. An edge clamped into the margin is open too (it is not there). The span is written in place, so the
|
|
267
|
+
* repaint path resolves a frame without allocating. Exported for the direct value pins (barrel-private).
|
|
268
|
+
* 1 つの層の中の外枠の 1 つの軸を `span` へ解き (v0.18)、層がこの軸で何かを囲むかを返す。層がこの軸で範囲のどこも描かないか、
|
|
269
|
+
* 範囲が層の ±1 画面の余白より外にあれば false (`span` はそのまま)。層はトラック `first..last` を描く。範囲の端が `first` より前か
|
|
270
|
+
* `last` より後にある側は別のペイン (かスクロールで外れた部分) へ続くため、余白の端に置いて開く — ペインはどれも自分が描くセルだけを
|
|
271
|
+
* 囲み、継ぎ目の無い 1 つの枠になる。余白へ詰めた辺も (そこに無いので) 開く。範囲はその場へ書くため、描き直しの道は確保なしに
|
|
272
|
+
* 外枠を解く。値ピン用にモジュール export (バレル非公開)。
|
|
271
273
|
*
|
|
274
|
+
* @param span - The span to write. 書く軸の範囲。
|
|
272
275
|
* @param start - The range's first track on this axis. 範囲のこの軸の最初のトラック。
|
|
273
276
|
* @param end - The range's last track on this axis. 範囲のこの軸の最後のトラック。
|
|
274
277
|
* @param first - The layer's first painted track. 層が描く最初のトラック。
|
|
@@ -276,11 +279,11 @@ export type FrameSpan = { near: number; far: number; nearOpen: boolean; farOpen:
|
|
|
276
279
|
* @param nearEdge - The range's near edge through the layer's map (px). 層の写像を通した範囲の近い辺 (px)。
|
|
277
280
|
* @param farEdge - The range's far edge through the layer's map (px). 層の写像を通した範囲の遠い辺 (px)。
|
|
278
281
|
* @param clamp - The layer's clamp extent (px). 層のクランプ範囲 (px)。
|
|
279
|
-
* @returns
|
|
282
|
+
* @returns Whether the layer frames anything on this axis. 層がこの軸で何かを囲むか。
|
|
280
283
|
*/
|
|
281
|
-
export const
|
|
284
|
+
export const frameSpanInto = (span: FrameSpan, start: number, end: number, first: number, last: number, nearEdge: number, farEdge: number, clamp: number): boolean => {
|
|
282
285
|
if (clamp <= 0 || last < first || end < first || start > last) {
|
|
283
|
-
return
|
|
286
|
+
return false
|
|
284
287
|
}
|
|
285
288
|
const low = -clamp * CLAMP_MARGIN_SCREENS
|
|
286
289
|
const high = clamp * (1 + CLAMP_MARGIN_SCREENS)
|
|
@@ -289,9 +292,45 @@ export const frameSpanOf = (start: number, end: number, first: number, last: num
|
|
|
289
292
|
const near = nearInside ? nearEdge : low
|
|
290
293
|
const far = farInside ? farEdge : high
|
|
291
294
|
if (far <= low || near >= high) {
|
|
292
|
-
return
|
|
295
|
+
return false
|
|
293
296
|
}
|
|
294
|
-
|
|
297
|
+
span.near = Math.max(near, low)
|
|
298
|
+
span.far = Math.min(far, high)
|
|
299
|
+
span.nearOpen = !nearInside || near < low
|
|
300
|
+
span.farOpen = !farInside || far > high
|
|
301
|
+
return true
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/**
|
|
305
|
+
* A span no frame has resolved into yet (NaN edges never equal a resolved one, so the first placement always writes).
|
|
306
|
+
* まだどの外枠も解いていない軸の範囲を作る処理 (NaN の辺は解いた辺と等しくならず、最初の置き方は必ず書く)。
|
|
307
|
+
*
|
|
308
|
+
* @returns The span. 軸の範囲。
|
|
309
|
+
*/
|
|
310
|
+
const unresolvedSpanOf = (): FrameSpan => ({ near: Number.NaN, far: Number.NaN, nearOpen: false, farOpen: false })
|
|
311
|
+
|
|
312
|
+
/**
|
|
313
|
+
* Whether two spans place a frame's axis alike (their edges and open sides).
|
|
314
|
+
* 2 つの軸の範囲が外枠の軸を同じに置くか (辺と開いた側)。
|
|
315
|
+
*
|
|
316
|
+
* @param a - One span. 一方の範囲。
|
|
317
|
+
* @param b - The other span. もう一方の範囲。
|
|
318
|
+
* @returns True when they are alike. 同じなら true。
|
|
319
|
+
*/
|
|
320
|
+
const sameSpan = (a: FrameSpan, b: FrameSpan): boolean => a.near === b.near && a.far === b.far && a.nearOpen === b.nearOpen && a.farOpen === b.farOpen
|
|
321
|
+
|
|
322
|
+
/**
|
|
323
|
+
* Copies a span's edges and open sides.
|
|
324
|
+
* 軸の範囲の辺と開いた側を写す処理。
|
|
325
|
+
*
|
|
326
|
+
* @param to - The span to write. 書く範囲。
|
|
327
|
+
* @param from - The span to read. 読む範囲。
|
|
328
|
+
*/
|
|
329
|
+
const copySpan = (to: FrameSpan, from: FrameSpan): void => {
|
|
330
|
+
to.near = from.near
|
|
331
|
+
to.far = from.far
|
|
332
|
+
to.nearOpen = from.nearOpen
|
|
333
|
+
to.farOpen = from.farOpen
|
|
295
334
|
}
|
|
296
335
|
|
|
297
336
|
/** The frame's sides in the CSS order, bit i of an open-side mask naming side i (v0.18). / CSS の順の外枠の辺 (v0.18)。開いた辺のマスクの bit i が辺 i。 */
|
|
@@ -742,29 +781,41 @@ export type ResizeGuide = { axis: "row" | "col"; position: number; anchor: "lead
|
|
|
742
781
|
type FillSlot = { node: HTMLDivElement; last: { shown: boolean; width: number; height: number; transform: string } }
|
|
743
782
|
|
|
744
783
|
/**
|
|
745
|
-
* The frame node of one quadrant plus its
|
|
746
|
-
*
|
|
747
|
-
*
|
|
748
|
-
*
|
|
784
|
+
* The frame node of one quadrant plus its placement state (v0.18 — same-value suppressed like a fill slot): the spans
|
|
785
|
+
* each repaint resolves into (`x`, `y`), the spans last placed (`drawnX`, `drawnY` — CSS is built only when they differ),
|
|
786
|
+
* the insets and sizes last written as CSS ("" = cleared) and the open-side mask of `data-aqsp-frame-open` (-1 = never
|
|
787
|
+
* written). A repaint that changes nothing allocates nothing.
|
|
788
|
+
* 象限 1 つの外枠のノードと置き方の状態 (v0.18 — fill のスロットと同じく同値抑止): 描き直しのたびに解く軸の範囲 (`x`・`y`)、最後に
|
|
789
|
+
* 置いた軸の範囲 (`drawnX`・`drawnY` — 違うときだけ CSS を作る)、最後に書いた CSS の詰めと大きさ ("" は外した値) と、
|
|
790
|
+
* `data-aqsp-frame-open` の開いた辺のマスク (-1 は未書込)。何も変えない描き直しは何も確保しない。
|
|
749
791
|
*/
|
|
750
|
-
type FrameSlot = {
|
|
792
|
+
type FrameSlot = {
|
|
793
|
+
node: HTMLDivElement
|
|
794
|
+
x: FrameSpan
|
|
795
|
+
y: FrameSpan
|
|
796
|
+
drawnX: FrameSpan
|
|
797
|
+
drawnY: FrameSpan
|
|
798
|
+
last: { shown: boolean; left: string; top: string; right: string; bottom: string; width: string; height: string; open: number }
|
|
799
|
+
}
|
|
751
800
|
|
|
752
801
|
/**
|
|
753
|
-
* One axis of a frame node's CSS placement (v0.18):
|
|
754
|
-
*
|
|
755
|
-
*
|
|
756
|
-
*
|
|
757
|
-
*
|
|
758
|
-
*
|
|
759
|
-
*
|
|
802
|
+
* One axis of a frame node's CSS placement (v0.18): the near side at its span position — a closed one where the range
|
|
803
|
+
* starts, an open one at the margin's edge, a screen before the quadrant's start, where its missing line is out of view
|
|
804
|
+
* — and a closed far side through the size, an open one pinned to the quadrant's far edge (end inset 0, size auto). The
|
|
805
|
+
* size of a closed far side is therefore never negative (its edge lies past the margin's), so a range that scrolled
|
|
806
|
+
* out before the quadrant's start leaves no stale box, and its far line sits where the range ends even within a line's
|
|
807
|
+
* width of the start. An open far side follows the quadrant's own size, so a resize that repaints nothing still runs
|
|
808
|
+
* the frame's other lines to the quadrant's edge. Exported for the direct value pins (barrel-private).
|
|
809
|
+
* 外枠のノードの 1 つの軸の CSS の置き方 (v0.18): 近い辺は軸の範囲の位置 — 閉じた辺は範囲の始まり、開いた辺は余白の端 (象限の始まりの
|
|
810
|
+
* 1 画面手前。描かない線は見えない所) — に置く。閉じた遠い辺は大きさで、開いた遠い辺は象限の遠い端に付ける (端の詰め 0、大きさ
|
|
811
|
+
* auto)。そのため閉じた遠い辺の大きさは負にならず (その辺は余白の端より先にある)、象限の始まりより手前へスクロールで外れた範囲が
|
|
812
|
+
* 古い箱を残さず、始まりから線の太さの内でも遠い線は範囲の終わりに描かれる。開いた遠い辺は象限自身の大きさに従うため、何も描き
|
|
813
|
+
* 直さない大きさの変化でも、枠のほかの線は象限の端まで届く。値ピン用にモジュール export (バレル非公開)。
|
|
760
814
|
*
|
|
761
|
-
* @param span - The axis's span (`
|
|
815
|
+
* @param span - The axis's span (`frameSpanInto`). 軸の範囲 (`frameSpanInto`)。
|
|
762
816
|
* @returns The start inset, the end inset and the size as CSS ("" = cleared). 始まりの詰め・終わりの詰め・大きさの CSS ("" は外す)。
|
|
763
817
|
*/
|
|
764
|
-
export const frameAxisCssOf = (span: FrameSpan): { start: string; end: string; size: string } => {
|
|
765
|
-
const start = span.nearOpen ? 0 : span.near
|
|
766
|
-
return span.farOpen ? { start: `${start}px`, end: "0px", size: "" } : { start: `${start}px`, end: "", size: `${span.far - start}px` }
|
|
767
|
-
}
|
|
818
|
+
export const frameAxisCssOf = (span: FrameSpan): { start: string; end: string; size: string } => (span.farOpen ? { start: `${span.near}px`, end: "0px", size: "" } : { start: `${span.near}px`, end: "", size: `${span.far - span.near}px` })
|
|
768
819
|
|
|
769
820
|
/** Resident node set of one overlay layer (v0.5 layer split; every layer owns a dedicated container). / overlay 1 層ぶんの常設ノード束 (v0.5 の層分割。全層が専用コンテナを持つ)。 */
|
|
770
821
|
type LayerNodes = {
|
|
@@ -887,14 +938,18 @@ type LayerCtx = {
|
|
|
887
938
|
*/
|
|
888
939
|
cells: BandExtents
|
|
889
940
|
/**
|
|
890
|
-
* The layer's cells per axis
|
|
891
|
-
*
|
|
892
|
-
* with a resize that repaints nothing
|
|
893
|
-
*
|
|
894
|
-
*
|
|
941
|
+
* The CSS of the layer's cells per axis (v0.18), resolved with the cached descriptors from the tracks alone
|
|
942
|
+
* (`layerCellsOf`): the band clip's size (`cellsSizeCssOf`) and the dividers' end inset (`cellsEndCssOf`) — the whole
|
|
943
|
+
* quadrant for a frozen band and in an unframed grid. CSS keeps both up with a resize that repaints nothing, and
|
|
944
|
+
* resolving them once per split geometry keeps a steady scroll frame from building them again.
|
|
945
|
+
* 層の軸ごとのセルの CSS (v0.18)。キャッシュした記述子と一緒に、トラックだけ (`layerCellsOf`) から解く: 帯の切り抜きの大きさ
|
|
946
|
+
* (`cellsSizeCssOf`) と分割線の端の詰め (`cellsEndCssOf`) — 凍結の帯と枠の無いグリッドは象限いっぱい。CSS が何も描き直さない
|
|
947
|
+
* 大きさの変化にも追いつき、分割の幾何ごとに 1 度だけ解くため、定常のスクロールのフレームは作り直さない。
|
|
895
948
|
*/
|
|
896
|
-
|
|
897
|
-
|
|
949
|
+
xCellsSizeCss: string
|
|
950
|
+
yCellsSizeCss: string
|
|
951
|
+
xCellsEndCss: string
|
|
952
|
+
yCellsEndCss: string
|
|
898
953
|
}
|
|
899
954
|
|
|
900
955
|
/**
|
|
@@ -1105,14 +1160,6 @@ export const SelectionOverlay = ({
|
|
|
1105
1160
|
nodes.dividerShown[slot] = shown
|
|
1106
1161
|
node.style.display = shown ? "" : "none"
|
|
1107
1162
|
}, [])
|
|
1108
|
-
/**
|
|
1109
|
-
* Equality-suppressed end heal of one divider slot (v0.18): a framed grid stops its dividers at the last painted
|
|
1110
|
-
* cell, so the vertical slots (0, 1) take `bottom` and the horizontal ones (2, 3) take `right` — the layer's clamp
|
|
1111
|
-
* extent minus its painted extent. An unframed grid computes 0, the JSX's end, and writes nothing.
|
|
1112
|
-
* 分割線スロット 1 つの端の等値抑制 heal (v0.18): 枠のあるグリッドは分割線を最後に描くセルで止めるため、縦のスロット (0・1) は
|
|
1113
|
-
* `bottom`、横 (2・3) は `right` に、層のクランプ範囲からセルを描く長さを引いた値を書く。枠の無いグリッドは JSX の端と同じ 0 に
|
|
1114
|
-
* なり、何も書かない。
|
|
1115
|
-
*/
|
|
1116
1163
|
/**
|
|
1117
1164
|
* Equality-suppressed size heal of the quadrant's band clip (v0.18): the cells the layer paints, so the band groups
|
|
1118
1165
|
* inside it end at the last painted cell. A quadrant without a clip (no frame) writes nothing.
|
|
@@ -1133,6 +1180,15 @@ export const SelectionOverlay = ({
|
|
|
1133
1180
|
clip.style.height = height
|
|
1134
1181
|
}
|
|
1135
1182
|
}, [])
|
|
1183
|
+
/**
|
|
1184
|
+
* Equality-suppressed end heal of one divider slot (v0.18): a framed grid stops its dividers at the last painted
|
|
1185
|
+
* cell, so the vertical slots (0, 1) take `bottom` and the horizontal ones (2, 3) take `right` — the part of the
|
|
1186
|
+
* quadrant past the layer's cells as CSS (`cellsEndCssOf`, resolved with the layer's descriptor), which follows a
|
|
1187
|
+
* resize that repaints nothing. An unframed grid's inset is `0px`, the JSX's end, and writes nothing.
|
|
1188
|
+
* 分割線スロット 1 つの端の等値抑制 heal (v0.18): 枠のあるグリッドは分割線を最後に描くセルで止めるため、縦のスロット (0・1) は
|
|
1189
|
+
* `bottom`、横 (2・3) は `right` に、象限のうち層のセルより先の部分を CSS で書く (`cellsEndCssOf`。層の記述子と一緒に解く)。何も
|
|
1190
|
+
* 描き直さない大きさの変化にも従う。枠の無いグリッドの詰めは JSX の端と同じ `0px` で、何も書かない。
|
|
1191
|
+
*/
|
|
1136
1192
|
const healDividerEnd = useCallback((nodes: LayerNodes, slot: number, inset: string) => {
|
|
1137
1193
|
const node = nodes.dividerSlots[slot]
|
|
1138
1194
|
if (node === null || nodes.dividerEnd[slot] === inset) {
|
|
@@ -1275,8 +1331,10 @@ export const SelectionOverlay = ({
|
|
|
1275
1331
|
yFirst,
|
|
1276
1332
|
yLast,
|
|
1277
1333
|
cells: { clampWidth: paintedExtentOf(xs.clamp, xCells), clampHeight: paintedExtentOf(ys.clamp, yCells) },
|
|
1278
|
-
xCells,
|
|
1279
|
-
yCells,
|
|
1334
|
+
xCellsSizeCss: cellsSizeCssOf(xCells),
|
|
1335
|
+
yCellsSizeCss: cellsSizeCssOf(yCells),
|
|
1336
|
+
xCellsEndCss: cellsEndCssOf(xCells),
|
|
1337
|
+
yCellsEndCss: cellsEndCssOf(yCells),
|
|
1280
1338
|
})
|
|
1281
1339
|
}
|
|
1282
1340
|
}
|
|
@@ -1320,14 +1378,12 @@ export const SelectionOverlay = ({
|
|
|
1320
1378
|
healDivider(ctx.nodes, 2, showYLead)
|
|
1321
1379
|
healDivider(ctx.nodes, 3, showYTrail)
|
|
1322
1380
|
// 枠のあるグリッドの分割線は層のセルで止める (縦は下、横は右を詰める。枠が無ければ 0px で書かない)
|
|
1323
|
-
|
|
1324
|
-
|
|
1325
|
-
healDividerEnd(ctx.nodes,
|
|
1326
|
-
healDividerEnd(ctx.nodes,
|
|
1327
|
-
healDividerEnd(ctx.nodes, 2, endX)
|
|
1328
|
-
healDividerEnd(ctx.nodes, 3, endX)
|
|
1381
|
+
healDividerEnd(ctx.nodes, 0, ctx.yCellsEndCss)
|
|
1382
|
+
healDividerEnd(ctx.nodes, 1, ctx.yCellsEndCss)
|
|
1383
|
+
healDividerEnd(ctx.nodes, 2, ctx.xCellsEndCss)
|
|
1384
|
+
healDividerEnd(ctx.nodes, 3, ctx.xCellsEndCss)
|
|
1329
1385
|
// 帯の切り抜きは層のセルの大きさ (枠の無いグリッドには切り抜きが無い)
|
|
1330
|
-
healBandClip(ctx.nodes,
|
|
1386
|
+
healBandClip(ctx.nodes, ctx.xCellsSizeCss, ctx.yCellsSizeCss)
|
|
1331
1387
|
}
|
|
1332
1388
|
return cache.ctxs
|
|
1333
1389
|
},
|
|
@@ -1365,7 +1421,7 @@ export const SelectionOverlay = ({
|
|
|
1365
1421
|
* のときだけで、毎フレームでは走らない。
|
|
1366
1422
|
*/
|
|
1367
1423
|
const setFrameSlot = useCallback((n: LayerNodes, el: HTMLDivElement | null) => {
|
|
1368
|
-
n.frame = el === null ? null : { node: el, last: { shown: false, left: "", top: "", right: "", bottom: "", width: "", height: "", open: -1 } }
|
|
1424
|
+
n.frame = el === null ? null : { node: el, x: unresolvedSpanOf(), y: unresolvedSpanOf(), drawnX: unresolvedSpanOf(), drawnY: unresolvedSpanOf(), last: { shown: false, left: "", top: "", right: "", bottom: "", width: "", height: "", open: -1 } }
|
|
1369
1425
|
rebuildChrome(n)
|
|
1370
1426
|
}, [])
|
|
1371
1427
|
/**
|
|
@@ -1563,17 +1619,26 @@ export const SelectionOverlay = ({
|
|
|
1563
1619
|
}, [])
|
|
1564
1620
|
|
|
1565
1621
|
/**
|
|
1566
|
-
*
|
|
1567
|
-
*
|
|
1622
|
+
* The frame range cut to the grid (`frameRangeWithin`), resolved again only when the range or the grid's counts
|
|
1623
|
+
* change, so a repaint pass reads it without allocating.
|
|
1624
|
+
* グリッドへ切った外枠の範囲 (`frameRangeWithin`)。範囲かグリッドの数が変わったときだけ解き直し、描き直しのパスは確保なしに読む。
|
|
1625
|
+
*/
|
|
1626
|
+
const frameWithinRef = useRef<{ range: CellRange | undefined; rows: number; cols: number; within: CellRange | null }>({ range: undefined, rows: -1, cols: -1, within: null })
|
|
1627
|
+
/**
|
|
1628
|
+
* Places one quadrant's frame (v0.18): the part of the frame range the layer paints (`frameSpanInto` on both axes,
|
|
1629
|
+
* the range first cut to the grid by `frameRangeWithin`), with the sides the range continues past marked open
|
|
1568
1630
|
* (`data-aqsp-frame-open`), hidden when the layer paints none of it, placed by insets (`frameAxisCssOf`) so its open
|
|
1569
|
-
* sides follow the quadrant's size.
|
|
1570
|
-
*
|
|
1571
|
-
*
|
|
1572
|
-
*
|
|
1631
|
+
* far sides follow the quadrant's size. The spans resolve into the slot's own spans and the CSS is built only when
|
|
1632
|
+
* they differ from the spans last placed, so a repaint that moves nothing allocates nothing; every write is
|
|
1633
|
+
* same-value suppressed besides (the fill slot's census #23 discipline): a steady scroll frame writes at most the
|
|
1634
|
+
* insets of the scrolled axis — the frame is one leaf node per quadrant, so the layout an inset costs is negligible
|
|
1635
|
+
* next to keeping the open sides right without a repaint.
|
|
1636
|
+
* 象限 1 つの外枠を置く (v0.18): 範囲 (先に `frameRangeWithin` でグリッドへ切る) のうち層が描く部分 (両軸の `frameSpanInto`) を
|
|
1573
1637
|
* 囲み、範囲が先へ続く辺は開く (`data-aqsp-frame-open`)。層が範囲のどこも描かなければ隠す。詰め (`frameAxisCssOf`) で置き、開いた
|
|
1574
|
-
*
|
|
1575
|
-
*
|
|
1576
|
-
*
|
|
1638
|
+
* 遠い辺は象限の大きさに従う。軸の範囲はスロット自身の範囲へ解き、最後に置いた範囲と違うときだけ CSS を作るため、何も動かさない
|
|
1639
|
+
* 描き直しは何も確保しない。そのうえ書き込みはどれも同値抑止 (fill のスロットの census #23 の規律) で、定常のスクロールのフレームが
|
|
1640
|
+
* 書くのはスクロールした軸の詰めまで — 外枠は象限に 1 つの葉のノードで、詰めが起こす配置の手間は、描き直さずに開いた辺を正しく
|
|
1641
|
+
* 保つことに比べて小さい。
|
|
1577
1642
|
*/
|
|
1578
1643
|
const placeFrame = useCallback(
|
|
1579
1644
|
(ctx: LayerCtx) => {
|
|
@@ -1581,13 +1646,22 @@ export const SelectionOverlay = ({
|
|
|
1581
1646
|
if (slot === null) {
|
|
1582
1647
|
return
|
|
1583
1648
|
}
|
|
1649
|
+
const cut = frameWithinRef.current
|
|
1584
1650
|
const range = frameRangeRef.current
|
|
1585
|
-
|
|
1586
|
-
|
|
1587
|
-
|
|
1651
|
+
if (cut.range !== range || cut.rows !== rowAxis.count || cut.cols !== colAxis.count) {
|
|
1652
|
+
cut.range = range
|
|
1653
|
+
cut.rows = rowAxis.count
|
|
1654
|
+
cut.cols = colAxis.count
|
|
1655
|
+
cut.within = range === undefined ? null : frameRangeWithin(range, rowAxis.count, colAxis.count)
|
|
1656
|
+
}
|
|
1657
|
+
const within = cut.within
|
|
1588
1658
|
const last = slot.last
|
|
1589
1659
|
const style = slot.node.style
|
|
1590
|
-
|
|
1660
|
+
const framed =
|
|
1661
|
+
within !== null &&
|
|
1662
|
+
frameSpanInto(slot.x, within.startCol, within.endCol, ctx.xFirst, ctx.xLast, ctx.mapX(colAxis.offsetOf(within.startCol)), ctx.mapX(colAxis.offsetOf(within.endCol) + colAxis.sizeOf(within.endCol)), ctx.clampWidth) &&
|
|
1663
|
+
frameSpanInto(slot.y, within.startRow, within.endRow, ctx.yFirst, ctx.yLast, ctx.mapY(rowAxis.offsetOf(within.startRow)), ctx.mapY(rowAxis.offsetOf(within.endRow) + rowAxis.sizeOf(within.endRow)), ctx.clampHeight)
|
|
1664
|
+
if (!framed) {
|
|
1591
1665
|
if (last.shown) {
|
|
1592
1666
|
last.shown = false
|
|
1593
1667
|
style.display = "none"
|
|
@@ -1598,33 +1672,39 @@ export const SelectionOverlay = ({
|
|
|
1598
1672
|
last.shown = true
|
|
1599
1673
|
style.display = "block"
|
|
1600
1674
|
}
|
|
1601
|
-
|
|
1602
|
-
|
|
1603
|
-
|
|
1604
|
-
last.left
|
|
1605
|
-
|
|
1606
|
-
|
|
1607
|
-
|
|
1608
|
-
last.right
|
|
1609
|
-
|
|
1610
|
-
|
|
1611
|
-
|
|
1612
|
-
last.width
|
|
1613
|
-
|
|
1614
|
-
|
|
1615
|
-
|
|
1616
|
-
last.top = vertical.start
|
|
1617
|
-
style.top = vertical.start
|
|
1618
|
-
}
|
|
1619
|
-
if (vertical.end !== last.bottom) {
|
|
1620
|
-
last.bottom = vertical.end
|
|
1621
|
-
style.bottom = vertical.end
|
|
1675
|
+
if (!sameSpan(slot.x, slot.drawnX)) {
|
|
1676
|
+
copySpan(slot.drawnX, slot.x)
|
|
1677
|
+
const horizontal = frameAxisCssOf(slot.x)
|
|
1678
|
+
if (horizontal.start !== last.left) {
|
|
1679
|
+
last.left = horizontal.start
|
|
1680
|
+
style.left = horizontal.start
|
|
1681
|
+
}
|
|
1682
|
+
if (horizontal.end !== last.right) {
|
|
1683
|
+
last.right = horizontal.end
|
|
1684
|
+
style.right = horizontal.end
|
|
1685
|
+
}
|
|
1686
|
+
if (horizontal.size !== last.width) {
|
|
1687
|
+
last.width = horizontal.size
|
|
1688
|
+
style.width = horizontal.size
|
|
1689
|
+
}
|
|
1622
1690
|
}
|
|
1623
|
-
if (
|
|
1624
|
-
|
|
1625
|
-
|
|
1691
|
+
if (!sameSpan(slot.y, slot.drawnY)) {
|
|
1692
|
+
copySpan(slot.drawnY, slot.y)
|
|
1693
|
+
const vertical = frameAxisCssOf(slot.y)
|
|
1694
|
+
if (vertical.start !== last.top) {
|
|
1695
|
+
last.top = vertical.start
|
|
1696
|
+
style.top = vertical.start
|
|
1697
|
+
}
|
|
1698
|
+
if (vertical.end !== last.bottom) {
|
|
1699
|
+
last.bottom = vertical.end
|
|
1700
|
+
style.bottom = vertical.end
|
|
1701
|
+
}
|
|
1702
|
+
if (vertical.size !== last.height) {
|
|
1703
|
+
last.height = vertical.size
|
|
1704
|
+
style.height = vertical.size
|
|
1705
|
+
}
|
|
1626
1706
|
}
|
|
1627
|
-
const open = frameOpenMaskOf(x, y)
|
|
1707
|
+
const open = frameOpenMaskOf(slot.x, slot.y)
|
|
1628
1708
|
if (open !== last.open) {
|
|
1629
1709
|
last.open = open
|
|
1630
1710
|
if (open === 0) {
|
|
@@ -370,6 +370,10 @@
|
|
|
370
370
|
position: absolute;
|
|
371
371
|
overflow: hidden;
|
|
372
372
|
pointer-events: none;
|
|
373
|
+
/* 中の印はどれも左上を原点とする物理の px で置く。右から左のページでも、左右が過剰制約になった印 (象限の遠い端より先で始まり
|
|
374
|
+
遠い端に付く外枠など) が left でなく right を捨てて象限の外に留まるよう、象限の向きを左から右に固める。象限は線と塗りだけを
|
|
375
|
+
持ち、文字のシンクは象限の外にあるので、入力の向きは変わらない */
|
|
376
|
+
direction: ltr;
|
|
373
377
|
}
|
|
374
378
|
|
|
375
379
|
/*
|