@aiquants/period-slider 0.7.0 → 0.8.0

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.
@@ -1,6 +1,10 @@
1
1
  /**
2
2
  * Period slider component: range, point and vernier dual-scale date selection on a single track.
3
+ * The vernier scale itself comes in two shapes - its micro rail selects either a period with two
4
+ * handles or a single point with one - so the component renders four selection shapes in total.
3
5
  * 1 本のトラック上で期間・時点・ノギス 2 段スケールの日付選択を行うコンポーネント本体。
6
+ * ノギスはさらに 2 形態 (ミクロレールが 2 つまみで期間を選ぶ形態と、1 つまみで時点を選ぶ形態) を持ち、
7
+ * 選択形態は全体で 4 つ。
4
8
  *
5
9
  * Holds the pure date encoding and geometry utilities shared by every mode, together with the
6
10
  * memoized React component and its prop-equality comparator.
@@ -163,11 +167,11 @@ export interface LabelSlantResult {
163
167
  * ステッパー名は配置ではなく値への作用で定義 (同じボタンが横向きでは左、縦向きでは下に立つため)。
164
168
  */
165
169
  export interface AccessibleSliderLabels {
166
- /** Accessible name for lower handle / 下限つまみのアクセシブル名 (既定: "Range start" / vernier モードでは "Micro range start") */
170
+ /** Accessible name for lower handle / 下限つまみのアクセシブル名 (既定: "Range start" / ノギスのミクロ期間形態では "Micro range start"。ミクロ時点形態には下限つまみが無く不活性) */
167
171
  lowerAriaLabel?: string
168
- /** Accessible name for upper handle / 上限つまみのアクセシブル名 (既定: "Range end" / vernier モードでは "Micro range end") */
172
+ /** Accessible name for upper handle / 上限つまみのアクセシブル名 (既定: "Range end" / ノギスのミクロ期間形態では "Micro range end"。ミクロ時点形態には上限つまみが無く不活性) */
169
173
  upperAriaLabel?: string
170
- /** Accessible name for single point handle / 単一選択つまみのアクセシブル名 (既定: "Selected date") */
174
+ /** Accessible name for the single selection handle of point mode and of the vernier micro point shape / 単一選択つまみのアクセシブル名 (既定: point モードでは "Selected date"、ノギスのミクロ時点形態では "Micro selected date") */
171
175
  pointAriaLabel?: string
172
176
  /** Accessible name for macro lower handle / マクロ下限つまみのアクセシブル名 (既定: "Macro range start") */
173
177
  macroLowerAriaLabel?: string
@@ -249,6 +253,9 @@ export interface PeriodSliderRangeProps extends BasePeriodSliderProps {
249
253
  microRange?: never
250
254
  defaultMicroRange?: never
251
255
  onChangeMicroRange?: never
256
+ microValue?: never
257
+ defaultMicroValue?: never
258
+ onChangeMicroPoint?: never
252
259
  }
253
260
 
254
261
  /**
@@ -274,13 +281,21 @@ export interface PeriodSliderPointProps extends BasePeriodSliderProps {
274
281
  microRange?: never
275
282
  defaultMicroRange?: never
276
283
  onChangeMicroRange?: never
284
+ microValue?: never
285
+ defaultMicroValue?: never
286
+ onChangeMicroPoint?: never
277
287
  }
278
288
 
279
289
  /**
280
- * Props of the vernier mode, where a macro window rail scopes the micro selection rail.
281
- * マクロ窓レールがミクロ選択レールの定義域となるノギスモードの Props。
290
+ * Props both vernier micro shapes share: the macro window rail and everything painted on either rail.
291
+ * ノギスの 2 形態が共有する Props (マクロ窓レールと両レールの描画設定)。
292
+ *
293
+ * The micro rail selects either a period or a point, and the props that express that choice live on the
294
+ * two shape interfaces below rather than here, so one shape's props can never be written on the other.
295
+ * ミクロレールの選択対象は期間か時点のいずれかであり、その選択を表す Props は本 interface ではなく
296
+ * 下の 2 形態 interface が持つため、一方の形態の Props をもう一方へ書くことは型として不可能。
282
297
  */
283
- export interface PeriodSliderVernierProps extends BasePeriodSliderProps {
298
+ export interface BasePeriodSliderVernierProps extends BasePeriodSliderProps {
284
299
  /** Vernier dual-scale integrated mode / ノギス型 2 段スケール一体型モード */
285
300
  mode: "vernier"
286
301
  /** Controlled macro window range [start, end] / マクロ側の広域表示窓 (必須・制御) */
@@ -288,13 +303,6 @@ export interface PeriodSliderVernierProps extends BasePeriodSliderProps {
288
303
  /** Callback triggered when the macro window changes / マクロ窓変更時コールバック */
289
304
  onChangeMacroRange?: (lower: Date, upper: Date) => void
290
305
 
291
- /** Controlled micro selected range tuple [lower, upper] / 制御時のミクロ選択期間タプル */
292
- microRange?: [Date, Date]
293
- /** Initial micro range tuple for uncontrolled usage / 非制御時の初期ミクロ選択期間タプル */
294
- defaultMicroRange?: [Date, Date]
295
- /** Callback triggered when the micro selected range changes / ミクロ選択範囲変更時コールバック */
296
- onChangeMicroRange?: (lower: Date, upper: Date) => void
297
-
298
306
  /** Vernier scale orientation; default is "macro-top" horizontally and "macro-left" when isVertical / ノギス配置方向 (既定: 横向き "macro-top"、isVertical 時 "macro-left") */
299
307
  vernierOrientation?: "macro-top" | "macro-bottom" | "macro-left" | "macro-right"
300
308
  /** Show semi-transparent trapezoid projection cone between macro and micro / 台形プロジェクション光の表示 (既定: true) */
@@ -330,6 +338,48 @@ export interface PeriodSliderVernierProps extends BasePeriodSliderProps {
330
338
  onChangePoint?: never
331
339
  }
332
340
 
341
+ /**
342
+ * Props of the vernier shape whose micro rail selects a period with two handles.
343
+ * ミクロレールが 2 つのつまみで期間を選ぶノギス形態の Props。
344
+ */
345
+ export interface PeriodSliderVernierRangeProps extends BasePeriodSliderVernierProps {
346
+ /** Controlled micro selected range tuple [lower, upper] / 制御時のミクロ選択期間タプル */
347
+ microRange?: [Date, Date]
348
+ /** Initial micro range tuple for uncontrolled usage / 非制御時の初期ミクロ選択期間タプル */
349
+ defaultMicroRange?: [Date, Date]
350
+ /** Callback triggered when the micro selected range changes / ミクロ選択範囲変更時コールバック */
351
+ onChangeMicroRange?: (lower: Date, upper: Date) => void
352
+
353
+ // ミクロ時点専用 Props の相互排他マーカー (ミクロが期間の形態では指定不可)
354
+ microValue?: never
355
+ defaultMicroValue?: never
356
+ onChangeMicroPoint?: never
357
+ }
358
+
359
+ /**
360
+ * Props of the vernier shape whose micro rail selects a single point with one handle.
361
+ * ミクロレールが 1 つのつまみで時点を選ぶノギス形態の Props。
362
+ */
363
+ export interface PeriodSliderVernierPointProps extends BasePeriodSliderVernierProps {
364
+ /** Controlled micro selected point / 制御時のミクロ選択時点 */
365
+ microValue?: Date
366
+ /** Initial micro point for uncontrolled usage / 非制御時の初期ミクロ選択時点 */
367
+ defaultMicroValue?: Date
368
+ /** Callback triggered when the micro selected point changes / ミクロ選択時点変更時コールバック */
369
+ onChangeMicroPoint?: (value: Date) => void
370
+
371
+ // ミクロ期間専用 Props の相互排他マーカー (ミクロが時点の形態では指定不可)
372
+ microRange?: never
373
+ defaultMicroRange?: never
374
+ onChangeMicroRange?: never
375
+ }
376
+
377
+ /**
378
+ * Discriminated union of both vernier micro shapes, keyed by which micro selection props are supplied.
379
+ * どちらのミクロ選択 Props を渡したかを判別子とする、ノギス 2 形態の判別可能合併型。
380
+ */
381
+ export type PeriodSliderVernierProps = PeriodSliderVernierRangeProps | PeriodSliderVernierPointProps
382
+
333
383
  /**
334
384
  * Discriminated union of every PeriodSlider mode, keyed by the mode prop.
335
385
  * mode Props を判別子とする全 PeriodSlider モードの判別可能合併型。
@@ -1048,7 +1098,13 @@ const withoutHorizontalPush = (geometry: LabelSlantResult): LabelSlantResult =>
1048
1098
  * Grabbable part of a vernier slider, naming both the rail and the element on it.
1049
1099
  * ノギススライダーで掴める部位 (レールと要素の組)。
1050
1100
  */
1051
- export type VernierHandle = "macro-low" | "macro-high" | "macro-connect" | "micro-low" | "micro-high" | "micro-connect"
1101
+ export type VernierHandle = "macro-low" | "macro-high" | "macro-connect" | "micro-low" | "micro-high" | "micro-connect" | "micro-point"
1102
+
1103
+ /**
1104
+ * What the vernier micro rail selects: a period spanned by two handles, or a point held by one.
1105
+ * ノギスのミクロレールが選ぶ対象 (2 つのつまみが張る期間か、1 つのつまみが指す時点か)。
1106
+ */
1107
+ export type VernierMicroShape = "range" | "point"
1052
1108
 
1053
1109
  /**
1054
1110
  * Resolves the target Vernier handle based on pointer primary-axis ratio and cross-axis offset relative to track center.
@@ -1063,6 +1119,7 @@ export type VernierHandle = "macro-low" | "macro-high" | "macro-connect" | "micr
1063
1119
  * @param orientation - Which rail the macro scale is drawn on (default: "macro-top") / マクロスケールを描くレール (既定: "macro-top")
1064
1120
  * @param handleHitSlopRatio - Hit slop around a knob as a 0-1 ratio (default: 0.05) / つまみ周辺の当たり判定余裕 (0-1 比率、既定: 0.05)
1065
1121
  * @param allowConnectHandles - Whether a press inside a band may grab the band itself (default: true) / 帯の内側の押下で帯自体を掴めるか (既定: true)
1122
+ * @param microShape - What the micro rail selects (default: "range") / ミクロレールの選択対象 (既定: "range")
1066
1123
  * @returns Handle the press targets / 押下が対象とするハンドル
1067
1124
  */
1068
1125
  export function resolveVernierTargetHandle(
@@ -1075,6 +1132,7 @@ export function resolveVernierTargetHandle(
1075
1132
  orientation: "macro-top" | "macro-bottom" | "macro-left" | "macro-right" = "macro-top",
1076
1133
  handleHitSlopRatio: number = 0.05,
1077
1134
  allowConnectHandles: boolean = true,
1135
+ microShape: VernierMicroShape = "range",
1078
1136
  ): VernierHandle {
1079
1137
  // orientation に応じて第一レール(上段または左段)がマクロかミクロかを決定
1080
1138
  const isFirstRailMacro = orientation === "macro-top" || orientation === "macro-left"
@@ -1098,6 +1156,11 @@ export function resolveVernierTargetHandle(
1098
1156
  }
1099
1157
 
1100
1158
  // ミクロ操作ゾーン
1159
+ // 時点形態のミクロレールはつまみ 1 つで帯を持たない。掴める相手が 1 つなら選定という段階自体が存在しない
1160
+ if (microShape === "point") {
1161
+ return "micro-point"
1162
+ }
1163
+
1101
1164
  const distLow = Math.abs(pointerPrimaryRatio - microLowRatio)
1102
1165
  const distHigh = Math.abs(pointerPrimaryRatio - microHighRatio)
1103
1166
 
@@ -1150,14 +1213,28 @@ export function calculateVernierMacroDrag(handle: "macro-low" | "macro-high" | "
1150
1213
  * Calculates updated micro selection range when dragging a micro handle or connect bar, supporting crossover swapping.
1151
1214
  * ミクロハンドルまたはコネクトバードラッグ時の新ミクロ範囲を算出します (上限下限反転スワップ対応)。
1152
1215
  *
1153
- * @param handle - Dragged micro handle or connect bar
1216
+ * A point handle carries no width, so it resolves to the bare clamped pointer ratio in both tuple slots:
1217
+ * that is what keeps the degenerate selection degenerate for the whole drag.
1218
+ * 時点つまみは幅を持たないため、両スロットともクランプ済みポインター比率そのものとなり、ドラッグ中ずっと幅ゼロが保たれる。
1219
+ *
1220
+ * @param handle - Dragged micro handle, connect bar or point handle
1154
1221
  * @param pointerRatio - Current pointer ratio across track (0.0 - 1.0)
1155
1222
  * @param startPointerRatio - Initial pointer ratio at drag start
1156
1223
  * @param startMicroLowRatio - Initial micro low ratio at drag start
1157
1224
  * @param startMicroHighRatio - Initial micro high ratio at drag start
1158
1225
  * @returns Tuple of [nextLowRatio, nextHighRatio, activeHandle]
1159
1226
  */
1160
- export function calculateVernierMicroDrag(handle: "micro-low" | "micro-high" | "micro-connect", pointerRatio: number, startPointerRatio: number, startMicroLowRatio: number, startMicroHighRatio: number): [number, number, "micro-low" | "micro-high" | "micro-connect"] {
1227
+ export function calculateVernierMicroDrag(
1228
+ handle: "micro-low" | "micro-high" | "micro-connect" | "micro-point",
1229
+ pointerRatio: number,
1230
+ startPointerRatio: number,
1231
+ startMicroLowRatio: number,
1232
+ startMicroHighRatio: number,
1233
+ ): [number, number, "micro-low" | "micro-high" | "micro-connect" | "micro-point"] {
1234
+ if (handle === "micro-point") {
1235
+ const clamped = Math.max(0, Math.min(1, pointerRatio))
1236
+ return [clamped, clamped, "micro-point"]
1237
+ }
1161
1238
  if (handle === "micro-connect") {
1162
1239
  const delta = pointerRatio - startPointerRatio
1163
1240
  const width = startMicroHighRatio - startMicroLowRatio
@@ -1328,26 +1405,68 @@ const assertSelectionProps = (props: PeriodSliderProps, minDate: Date, maxDate:
1328
1405
  }
1329
1406
 
1330
1407
  /**
1331
- * Validates the mandatory vernier props and resolves the micro selection that seeds the uncontrolled state.
1332
- * ノギスモードの必須 Props を検証し、非制御ステートの初期値となるミクロ選択期間を解決する関数。
1408
+ * Micro selection a vernier slider was rendered with: the shape the props declare, and the tuple geometry reads.
1409
+ * ノギスが描画に用いるミクロ選択 (Props が宣言する形態と、幾何計算が読むタプル)。
1333
1410
  *
1334
- * @param macroRange - Macro window tuple; the micro rail spans exactly this window / マクロ窓タプル (ミクロレールの定義域そのもの)
1335
- * @param microRange - Controlled micro selection tuple, or undefined when uncontrolled / 制御時のミクロ選択タプル (非制御時は undefined)
1336
- * @param defaultMicroRange - Initial micro selection tuple for uncontrolled usage / 非制御時の初期ミクロ選択タプル
1337
- * @returns Validated micro selection tuple / 検証済みのミクロ選択タプル
1338
- * @throws RangeError when macroRange is unusable, or when neither micro selection prop is supplied / macroRange が利用不能な場合、またはミクロ選択 Props がいずれも未指定の場合
1339
- */
1340
- const assertVernierRanges = (macroRange: [Date, Date], microRange: [Date, Date] | undefined, defaultMicroRange: [Date, Date] | undefined): [Date, Date] => {
1341
- assertDateRangeTuple("macroRange", macroRange)
1342
- if (microRange !== undefined) {
1343
- assertDateRangeTuple("microRange", microRange)
1344
- return microRange
1345
- }
1346
- if (defaultMicroRange !== undefined) {
1347
- assertDateRangeTuple("defaultMicroRange", defaultMicroRange)
1348
- return defaultMicroRange
1349
- }
1350
- throw new RangeError("PeriodSlider: vernier mode requires a micro selection; supply microRange (controlled) or defaultMicroRange (uncontrolled)")
1411
+ * A point is carried as a zero-width tuple so that ratios, ticks, projection, window translation and the
1412
+ * stepper stay one implementation instead of two.
1413
+ * 時点は幅ゼロのタプルとして保持することで、比率・目盛・投影・窓平行移動・ステッパーの実装が 2 系統に分かれない。
1414
+ */
1415
+ interface VernierMicroSelection {
1416
+ /** Shape the supplied micro props declare / 指定されたミクロ Props が宣言する形態 */
1417
+ shape: VernierMicroShape
1418
+ /** Selection every rail computation reads / 全レール計算が読む選択 */
1419
+ selection: [Date, Date]
1420
+ }
1421
+
1422
+ /**
1423
+ * Validates the mandatory vernier props and resolves which micro shape the caller asked for.
1424
+ * ノギスモードの必須 Props を検証し、利用側が要求したミクロ形態を解決する関数。
1425
+ *
1426
+ * The two micro families are mutually exclusive: supplying both leaves the handle count undetermined, and
1427
+ * silently preferring one of them would leave the callback of the other silent forever.
1428
+ * ミクロ 2 系統は相互排他。両方指定するとつまみ数が決まらず、黙って片方を優先すれば他方のコールバックは永久に鳴らない。
1429
+ *
1430
+ * @param props - Raw vernier props the component was rendered with / コンポーネントへ渡された生のノギス Props
1431
+ * @returns Resolved micro shape and the selection tuple seeding the uncontrolled state / 解決済みのミクロ形態と、非制御ステートの初期値となる選択タプル
1432
+ * @throws RangeError when macroRange is unusable, when both micro families are supplied, or when neither is / macroRange が利用不能な場合、ミクロ 2 系統を同時指定した場合、いずれも未指定の場合
1433
+ */
1434
+ const resolveVernierMicroSelection = (props: PeriodSliderVernierProps): VernierMicroSelection => {
1435
+ assertDateRangeTuple("macroRange", props.macroRange)
1436
+
1437
+ const hasRangeProps = props.microRange !== undefined || props.defaultMicroRange !== undefined || props.onChangeMicroRange !== undefined
1438
+ const hasPointProps = props.microValue !== undefined || props.defaultMicroValue !== undefined || props.onChangeMicroPoint !== undefined
1439
+
1440
+ if (hasRangeProps && hasPointProps) {
1441
+ throw new RangeError("PeriodSlider: vernier mode takes either a micro range (microRange / defaultMicroRange / onChangeMicroRange) or a micro point (microValue / defaultMicroValue / onChangeMicroPoint), never both")
1442
+ }
1443
+
1444
+ if (hasPointProps) {
1445
+ if (props.microValue !== undefined) {
1446
+ assertSelectionDate("microValue", props.microValue)
1447
+ return { shape: "point", selection: [props.microValue, props.microValue] }
1448
+ }
1449
+ if (props.defaultMicroValue !== undefined) {
1450
+ assertSelectionDate("defaultMicroValue", props.defaultMicroValue)
1451
+ return { shape: "point", selection: [props.defaultMicroValue, props.defaultMicroValue] }
1452
+ }
1453
+ throw new RangeError("PeriodSlider: vernier point mode requires a micro selection; supply microValue (controlled) or defaultMicroValue (uncontrolled)")
1454
+ }
1455
+
1456
+ if (props.microRange !== undefined) {
1457
+ assertDateRangeTuple("microRange", props.microRange)
1458
+ return { shape: "range", selection: props.microRange }
1459
+ }
1460
+ if (props.defaultMicroRange !== undefined) {
1461
+ assertDateRangeTuple("defaultMicroRange", props.defaultMicroRange)
1462
+ return { shape: "range", selection: props.defaultMicroRange }
1463
+ }
1464
+ // 形態を宣言済みの呼び出し側へ他方の形態の救済を示すと、それは型エラーであり、
1465
+ // JavaScript から従えば相互排他の RangeError になる。辿れる救済だけを示す
1466
+ if (hasRangeProps) {
1467
+ throw new RangeError("PeriodSlider: vernier range mode requires a micro selection; supply microRange (controlled) or defaultMicroRange (uncontrolled)")
1468
+ }
1469
+ throw new RangeError("PeriodSlider: vernier mode requires a micro selection; supply microRange / defaultMicroRange for a period, or microValue / defaultMicroValue for a point")
1351
1470
  }
1352
1471
 
1353
1472
  /**
@@ -1619,8 +1738,11 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1619
1738
  // 不正なロケールを黙って ISO 表記へ落とすと、利用側は翻訳が効かない理由に気付けない
1620
1739
  if (locale !== undefined) assertLocaleTag("locale", locale)
1621
1740
 
1622
- // マクロ窓とミクロ選択もノギスの位置計算の根拠そのもの。欠ければ同じくフック前に失敗させる
1623
- const initialVernierMicroRange: [Date, Date] | null = props.mode === "vernier" ? assertVernierRanges(props.macroRange, props.microRange, props.defaultMicroRange) : null
1741
+ // マクロ窓とミクロ選択もノギスの位置計算の根拠そのもの。欠ければ同じくフック前に失敗させる。
1742
+ // 形態はステートへ写さず毎レンダー Props から解決する。写すと利用側が形態を差し替えた瞬間に、
1743
+ // 描かれるつまみ数と鳴るコールバックが食い違う
1744
+ const vernierMicro: VernierMicroSelection | null = props.mode === "vernier" ? resolveVernierMicroSelection(props) : null
1745
+ const isMicroPointShape = vernierMicro !== null && vernierMicro.shape === "point"
1624
1746
 
1625
1747
  const palette = COLOR_SCHEME_PALETTES[colorScheme]
1626
1748
  const vernierGradId = useId()
@@ -1680,11 +1802,32 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1680
1802
  // ------------------------------------------------------------------
1681
1803
  // C. 内部ステートの初期化と同期
1682
1804
  // ------------------------------------------------------------------
1683
- // ノギス非制御時のミクロ選択。初期値は defaultMicroRange、以降は notifyMicroRange が唯一の書き込み経路
1684
- const [uncontrolledMicroRange, setUncontrolledMicroRange] = useState<[Date, Date] | null>(() => initialVernierMicroRange)
1805
+ // ノギス非制御時のミクロ選択。初期値は defaultMicroRange / defaultMicroValue、以降は notifyMicroSelection が唯一の書き込み経路
1806
+ const [uncontrolledMicroRangeState, setUncontrolledMicroRange] = useState<[Date, Date] | null>(() => (vernierMicro === null ? null : vernierMicro.selection))
1807
+
1808
+ // 形態が時点へ入れ替わると、期間として確定していた非制御ステートは幅を持ったまま残る。
1809
+ // 幅ゼロであることが時点形態の全計算 (とりわけステッパーの端判定) の前提なので、
1810
+ // frontVernierHandle と同じくレンダー中に畳み込む (残すのは描かれるつまみが指している下限側)
1811
+ // 初期化子は mount 時にしか走らないため、後から mode を vernier へ切り替えた木ではステートが null のまま残る。
1812
+ // 解決済みのミクロ選択は毎レンダー手に入るので、null はそこへ落とす (落とさないとレール両端まで開いた選択に化ける)
1813
+ let uncontrolledMicroRange = uncontrolledMicroRangeState ?? (vernierMicro === null ? null : vernierMicro.selection)
1814
+ if (isMicroPointShape && uncontrolledMicroRange !== null && uncontrolledMicroRange[0].getTime() !== uncontrolledMicroRange[1].getTime()) {
1815
+ const foldedMicroSelection: [Date, Date] = [uncontrolledMicroRange[0], uncontrolledMicroRange[0]]
1816
+ uncontrolledMicroRange = foldedMicroSelection
1817
+ setUncontrolledMicroRange(foldedMicroSelection)
1818
+ }
1819
+
1820
+ // 制御時の時点は毎レンダー新しいタプルになる。指している時刻が動かない限り同じ参照を返さないと、
1821
+ // これを依存に持つ下流の useMemo が毎レンダー再計算になる
1822
+ const controlledMicroPointMs = props.mode === "vernier" ? props.microValue?.getTime() : undefined
1823
+ const controlledMicroPoint = useMemo<[Date, Date] | null>(() => {
1824
+ if (props.mode !== "vernier" || props.microValue === undefined) return null
1825
+ return [props.microValue, props.microValue]
1826
+ }, [props.mode, controlledMicroPointMs])
1685
1827
 
1686
- // null はノギス以外を意味する。ノギスでは assertVernierRanges が値の存在を保証済み
1687
- const vernierMicroSelection: [Date, Date] | null = props.mode !== "vernier" ? null : props.microRange !== undefined ? props.microRange : uncontrolledMicroRange
1828
+ // null はノギス以外を意味する。ノギスでは resolveVernierMicroSelection が値の存在を保証済み。
1829
+ // 時点形態も同じ幅ゼロタプルで表すため、以降の全計算は形態を意識しない
1830
+ const vernierMicroSelection: [Date, Date] | null = props.mode !== "vernier" ? null : isMicroPointShape ? (controlledMicroPoint ?? uncontrolledMicroRange) : props.microRange !== undefined ? props.microRange : uncontrolledMicroRange
1688
1831
 
1689
1832
  const effectiveLowerDate: Date | undefined = props.mode === "range" ? (props.range?.[0] ?? props.defaultRange?.[0]) : props.mode === "vernier" ? vernierMicroSelection?.[0] : undefined
1690
1833
 
@@ -1706,7 +1849,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1706
1849
  }, [props.mode, propLowerMs, propUpperMs, dateToValue, effectivePointDate, effectiveLowerDate, effectiveUpperDate])
1707
1850
 
1708
1851
  // 非制御 (Uncontrolled) 運用時の自律ステート管理
1709
- const isControlled = props.mode === "point" ? props.value !== undefined : props.mode === "range" ? props.range !== undefined : props.microRange !== undefined
1852
+ const isControlled = props.mode === "point" ? props.value !== undefined : props.mode === "range" ? props.range !== undefined : isMicroPointShape ? props.microValue !== undefined : props.microRange !== undefined
1710
1853
 
1711
1854
  const [uncontrolledValues, setUncontrolledValues] = useState<[number, number]>(() => [initLow, initHigh])
1712
1855
 
@@ -1757,7 +1900,24 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1757
1900
  const [activeVernierHandle, setActiveVernierHandle] = useState<VernierHandle | null>(null)
1758
1901
  const activeVernierHandleRef = useRef<VernierHandle | null>(null)
1759
1902
  activeVernierHandleRef.current = activeVernierHandle
1760
- const [frontVernierHandle, setFrontVernierHandle] = useState<VernierHandle>("micro-high")
1903
+ // 初期前面は実在するつまみでなければならない。時点形態に micro-high は無く、
1904
+ // 描かれないハンドルを初期値にすると最初の 1 回だけ前面が誰も指さない状態になる
1905
+ const [frontVernierHandleState, setFrontVernierHandle] = useState<VernierHandle>(() => (isMicroPointShape ? "micro-point" : "micro-high"))
1906
+
1907
+ // ミクロ形態は実行中に入れ替わり得る。入れ替わった直後の前面は描かれないつまみを指したままになるため、
1908
+ // フックが包含の崩れたステートを畳むのと同じく、レンダー中にその形態へ実在するつまみへ畳み直す
1909
+ let frontVernierHandle = frontVernierHandleState
1910
+ const foldedFrontVernierHandle: VernierHandle | null = isMicroPointShape
1911
+ ? frontVernierHandleState === "micro-low" || frontVernierHandleState === "micro-high" || frontVernierHandleState === "micro-connect"
1912
+ ? "micro-point"
1913
+ : null
1914
+ : frontVernierHandleState === "micro-point"
1915
+ ? "micro-high"
1916
+ : null
1917
+ if (foldedFrontVernierHandle !== null) {
1918
+ frontVernierHandle = foldedFrontVernierHandle
1919
+ setFrontVernierHandle(foldedFrontVernierHandle)
1920
+ }
1761
1921
 
1762
1922
  // マクロ境界 (ノギス以外では読まれないが、定義域そのものなので分岐せず素直に求める)
1763
1923
  const vernierMacroMinEnc = useMemo(() => encode(macroUnit, minDate), [minTime, macroUnit])
@@ -1921,7 +2081,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1921
2081
  const lowDate = valueToDate(nextLow)
1922
2082
  const highDate = valueToDate(nextHigh)
1923
2083
 
1924
- // ノギスモードは値空間 (rangeMin/rangeMax) が別系統のため、この経路ではなく notifyMicroRange / notifyMacroRange を使う
2084
+ // ノギスモードは値空間 (rangeMin/rangeMax) が別系統のため、この経路ではなく notifyMicroSelection / notifyMacroRange を使う
1925
2085
  const doEmit = () => {
1926
2086
  // 予約から発火までの間に利用側が別のハンドラへ差し替えることがある。
1927
2087
  // 予約時点のスナップショットを閉じ込めると、既に捨てられたクロージャだけが呼ばれる
@@ -1967,15 +2127,19 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1967
2127
  )
1968
2128
 
1969
2129
  /**
1970
- * Commits the micro range to the uncontrolled state when needed and emits the canonical callback.
2130
+ * Commits the micro selection to the uncontrolled state when needed and emits the canonical callback.
1971
2131
  * 非制御時はミクロ選択ステートを更新したうえで、正準コールバックを発火する関数。
1972
2132
  *
1973
- * @param lower - New micro range start date / 新しいミクロ範囲の開始日付
1974
- * @param upper - New micro range end date / 新しいミクロ範囲の終了日付
2133
+ * Both micro shapes share this one commit path and the shape decides which callback is canonical, so a
2134
+ * point consumer never receives a period notification and a period consumer never receives a point one.
2135
+ * ミクロ 2 形態はこの唯一の確定経路を共有し、形態が正準コールバックを決めるため、時点の利用側へ期間の通知が届くことはない (逆も同様)。
2136
+ *
2137
+ * @param lower - New micro selection start date / 新しいミクロ選択の開始日付
2138
+ * @param upper - New micro selection end date, equal to lower in point shape / 新しいミクロ選択の終了日付 (時点形態では lower と同値)
1975
2139
  * @param immediate - Bypasses debounceMs and emits at once / debounceMs を迂回して即時発火するか
1976
2140
  * @returns Nothing / 戻り値なし
1977
2141
  */
1978
- const notifyMicroRange = useCallback(
2142
+ const notifyMicroSelection = useCallback(
1979
2143
  (lower: Date, upper: Date, immediate = false) => {
1980
2144
  const p = propsRef.current
1981
2145
  if (p.mode !== "vernier") return
@@ -1983,20 +2147,46 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
1983
2147
  const clampedUpper = clampToDomain(upper)
1984
2148
  // 非制御時はここが唯一の自律更新点。書かなければコールバックだけが鳴り、つまみは初期位置で固まる。
1985
2149
  // デバウンス対象は利用側への通知のみで、つまみ追従までは遅らせない
1986
- if (p.microRange === undefined) {
2150
+ if (isMicroPointShape ? p.microValue === undefined : p.microRange === undefined) {
1987
2151
  setUncontrolledMicroRange([clampedLower, clampedUpper])
1988
2152
  }
1989
2153
  scheduleEmit(
1990
2154
  microEmitRef.current,
1991
2155
  () => {
2156
+ // 予約から発火までの間に利用側がハンドラを差し替えることがあるため、ハンドラは現在の Props から読む。
2157
+ // 形態だけは予約時点のものを使う。報告する値はその形態が生んだ値であり、
2158
+ // 発火直前の差し替えで読み替えると幅ゼロの期間が鳴ってしまう
1992
2159
  const current = propsRef.current
1993
2160
  if (current.mode !== "vernier") return
2161
+ if (isMicroPointShape) {
2162
+ current.onChangeMicroPoint?.(clampedLower)
2163
+ return
2164
+ }
1994
2165
  current.onChangeMicroRange?.(clampedLower, clampedUpper)
1995
2166
  },
1996
2167
  immediate,
1997
2168
  )
1998
2169
  },
1999
- [clampToDomain, scheduleEmit],
2170
+ [clampToDomain, scheduleEmit, isMicroPointShape],
2171
+ )
2172
+
2173
+ /**
2174
+ * Commits a micro point as the zero-width selection every rail computation reads.
2175
+ * ミクロ時点を、全レール計算が読む幅ゼロの選択として確定する関数。
2176
+ *
2177
+ * Point-only paths go through here instead of calling the selection commit directly, so no such path
2178
+ * can open a width by handing it two different dates.
2179
+ * 時点専用の経路は選択確定関数を直接呼ばず本関数を通すため、異なる 2 日付を渡して幅を開くことが構造的に起こらない。
2180
+ *
2181
+ * @param value - New micro point date / 新しいミクロ選択時点
2182
+ * @param immediate - Bypasses debounceMs and emits at once / debounceMs を迂回して即時発火するか
2183
+ * @returns Nothing / 戻り値なし
2184
+ */
2185
+ const notifyMicroPoint = useCallback(
2186
+ (value: Date, immediate = false) => {
2187
+ notifyMicroSelection(value, value, immediate)
2188
+ },
2189
+ [notifyMicroSelection],
2000
2190
  )
2001
2191
 
2002
2192
  // ------------------------------------------------------------------
@@ -2243,9 +2433,9 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2243
2433
  const microKey = `${nextMicroLowDate.getTime()}_${nextMicroHighDate.getTime()}`
2244
2434
  if (microKey !== lastEmittedMicroRangeRef.current) {
2245
2435
  lastEmittedMicroRangeRef.current = microKey
2246
- notifyMicroRange(nextMicroLowDate, nextMicroHighDate)
2436
+ notifyMicroSelection(nextMicroLowDate, nextMicroHighDate)
2247
2437
  }
2248
- } else if (vCtx.handle === "micro-low" || vCtx.handle === "micro-high" || vCtx.handle === "micro-connect") {
2438
+ } else if (vCtx.handle === "micro-low" || vCtx.handle === "micro-high" || vCtx.handle === "micro-connect" || vCtx.handle === "micro-point") {
2249
2439
  const [nextMicroLowRatio, nextMicroHighRatio, activeMicroHandle] = calculateVernierMicroDrag(vCtx.handle, pointerRatio, vCtx.startPointerRatio, vCtx.startMicroLowRatio, vCtx.startMicroHighRatio)
2250
2440
  if (activeMicroHandle !== activeVernierHandleRef.current) {
2251
2441
  activeVernierHandleRef.current = activeMicroHandle
@@ -2270,7 +2460,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2270
2460
  const microKey = `${nextMicroLowDate.getTime()}_${nextMicroHighDate.getTime()}`
2271
2461
  if (microKey !== lastEmittedMicroRangeRef.current) {
2272
2462
  lastEmittedMicroRangeRef.current = microKey
2273
- notifyMicroRange(nextMicroLowDate, nextMicroHighDate)
2463
+ notifyMicroSelection(nextMicroLowDate, nextMicroHighDate)
2274
2464
  }
2275
2465
  }
2276
2466
  return
@@ -2353,7 +2543,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2353
2543
  pctToValue,
2354
2544
  notifyChange,
2355
2545
  notifyMacroRange,
2356
- notifyMicroRange,
2546
+ notifyMicroSelection,
2357
2547
  isPointMode,
2358
2548
  ],
2359
2549
  )
@@ -2529,7 +2719,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2529
2719
  if (pointerRatio === null) return
2530
2720
  const pointerCrossAxisOffset = isVertical ? e.clientX - (rect.left + rect.width / 2) : e.clientY - (rect.top + rect.height / 2)
2531
2721
  // 帯を隠したまま帯ドラッグだけ残ると、描かれていない当たり判定が生き続ける
2532
- const targetHandle = resolveVernierTargetHandle(pointerRatio, pointerCrossAxisOffset, macroLowRatio, macroHighRatio, microLowRatio, microHighRatio, vernierOrientation, undefined, !hideConnectBar)
2722
+ const targetHandle = resolveVernierTargetHandle(pointerRatio, pointerCrossAxisOffset, macroLowRatio, macroHighRatio, microLowRatio, microHighRatio, vernierOrientation, undefined, !hideConnectBar, isMicroPointShape ? "point" : "range")
2533
2723
  startVernierDrag(e.pointerId, targetHandle, pointerRatio)
2534
2724
  return
2535
2725
  }
@@ -2595,18 +2785,22 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2595
2785
  * Re-contains the micro selection into a newly resolved macro window and emits it only when it moved.
2596
2786
  * 新しく確定したマクロ窓へミクロ選択を収め直し、実際に動いた場合のみ発火する関数。
2597
2787
  *
2788
+ * The clamp is applied to the two tuple slots with the upper one floored at the lower, so a zero-width
2789
+ * point selection stays a point: the shape needs no branch of its own here.
2790
+ * クランプは上限を下限で床止めしてタプル 2 枠へ適用するため、幅ゼロの時点選択は時点のまま保たれ、形態別の分岐を持たない。
2791
+ *
2598
2792
  * @param nextMacroLow - Start date of the macro window just resolved / 確定直後のマクロ窓開始日付
2599
2793
  * @param nextMacroHigh - End date of the macro window just resolved / 確定直後のマクロ窓終了日付
2600
2794
  * @returns Nothing / 戻り値なし
2601
2795
  */
2602
- const containMicroRangeIntoMacroWindow = (nextMacroLow: Date, nextMacroHigh: Date): void => {
2796
+ const containMicroSelectionIntoMacroWindow = (nextMacroLow: Date, nextMacroHigh: Date): void => {
2603
2797
  // 次のレンダーでミクロレール端はこの式へ置き換わる。同じ式で収め直さないと aria-valuenow が aria-valuemax の外を指し続ける
2604
2798
  const nextMicroMinEnc = Math.max(encode(microUnit, nextMacroLow), encode(microUnit, minDate))
2605
2799
  const nextMicroMaxEnc = Math.min(encode(microUnit, getMacroWindowEndDate(macroUnit, microUnit, nextMacroHigh)), encode(microUnit, maxDate))
2606
2800
  const clampedLowEnc = Math.max(nextMicroMinEnc, Math.min(nextMicroMaxEnc, vernierMicroLowEnc))
2607
2801
  const clampedHighEnc = Math.max(clampedLowEnc, Math.min(nextMicroMaxEnc, vernierMicroHighEnc))
2608
2802
  if (clampedLowEnc === vernierMicroLowEnc && clampedHighEnc === vernierMicroHighEnc) return
2609
- notifyMicroRange(decode(microUnit, clampedLowEnc), decode(microUnit, clampedHighEnc), true)
2803
+ notifyMicroSelection(decode(microUnit, clampedLowEnc), decode(microUnit, clampedHighEnc), true)
2610
2804
  }
2611
2805
 
2612
2806
  /**
@@ -2620,7 +2814,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2620
2814
  * @param handle - The Vernier handle being manipulated / 操作対象のノギスハンドル
2621
2815
  * @returns Keyboard event handler for the given handle / 指定ハンドル用のキーボードイベントハンドラ
2622
2816
  */
2623
- const handleVernierKeyDown = (handle: "macro-low" | "macro-high" | "micro-low" | "micro-high") => (e: React.KeyboardEvent<HTMLDivElement>) => {
2817
+ const handleVernierKeyDown = (handle: "macro-low" | "macro-high" | "micro-low" | "micro-high" | "micro-point") => (e: React.KeyboardEvent<HTMLDivElement>) => {
2624
2818
  if (disabled || !isVernierMode || props.mode !== "vernier") return
2625
2819
  setFrontVernierHandle(handle)
2626
2820
  let delta = 0
@@ -2662,7 +2856,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2662
2856
  if (nextIdx === findNearestDateIndex(sortedMacroAllowedDates, currentLow, macroUnit)) return
2663
2857
  const nextLow = sortedMacroAllowedDates[nextIdx]
2664
2858
  notifyMacroRange(nextLow, currentHigh, true)
2665
- containMicroRangeIntoMacroWindow(nextLow, currentHigh)
2859
+ containMicroSelectionIntoMacroWindow(nextLow, currentHigh)
2666
2860
  return
2667
2861
  }
2668
2862
  let next: number
@@ -2672,7 +2866,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2672
2866
  if (next === vernierMacroLowEnc) return
2673
2867
  const nextLow = decode(macroUnit, next)
2674
2868
  notifyMacroRange(nextLow, currentHigh, true)
2675
- containMicroRangeIntoMacroWindow(nextLow, currentHigh)
2869
+ containMicroSelectionIntoMacroWindow(nextLow, currentHigh)
2676
2870
  } else if (handle === "macro-high") {
2677
2871
  const currentLow = decode(macroUnit, vernierMacroLowEnc)
2678
2872
  const currentHigh = decode(macroUnit, vernierMacroHighEnc)
@@ -2681,7 +2875,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2681
2875
  if (nextIdx === findNearestDateIndex(sortedMacroAllowedDates, currentHigh, macroUnit)) return
2682
2876
  const nextHigh = sortedMacroAllowedDates[nextIdx]
2683
2877
  notifyMacroRange(currentLow, nextHigh, true)
2684
- containMicroRangeIntoMacroWindow(currentLow, nextHigh)
2878
+ containMicroSelectionIntoMacroWindow(currentLow, nextHigh)
2685
2879
  return
2686
2880
  }
2687
2881
  let next: number
@@ -2691,14 +2885,14 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2691
2885
  if (next === vernierMacroHighEnc) return
2692
2886
  const nextHigh = decode(macroUnit, next)
2693
2887
  notifyMacroRange(currentLow, nextHigh, true)
2694
- containMicroRangeIntoMacroWindow(currentLow, nextHigh)
2888
+ containMicroSelectionIntoMacroWindow(currentLow, nextHigh)
2695
2889
  } else if (handle === "micro-low") {
2696
2890
  const currentLow = decode(microUnit, vernierMicroLowEnc)
2697
2891
  const currentHigh = decode(microUnit, vernierMicroHighEnc)
2698
2892
  if (microIsDiscreteScale) {
2699
2893
  const nextIdx = stepDiscreteIndex(sortedMicroAllowedDates, microUnit, currentLow, sortedMicroAllowedDates[0], currentHigh, delta, isHome, isEnd)
2700
2894
  if (nextIdx === findNearestDateIndex(sortedMicroAllowedDates, currentLow, microUnit)) return
2701
- notifyMicroRange(sortedMicroAllowedDates[nextIdx], currentHigh, true)
2895
+ notifyMicroSelection(sortedMicroAllowedDates[nextIdx], currentHigh, true)
2702
2896
  return
2703
2897
  }
2704
2898
  let next: number
@@ -2706,14 +2900,14 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2706
2900
  else if (isEnd) next = vernierMicroHighEnc
2707
2901
  else next = Math.max(vernierMicroMinEnc, Math.min(vernierMicroHighEnc, vernierMicroLowEnc + delta))
2708
2902
  if (next === vernierMicroLowEnc) return
2709
- notifyMicroRange(decode(microUnit, next), currentHigh, true)
2903
+ notifyMicroSelection(decode(microUnit, next), currentHigh, true)
2710
2904
  } else if (handle === "micro-high") {
2711
2905
  const currentLow = decode(microUnit, vernierMicroLowEnc)
2712
2906
  const currentHigh = decode(microUnit, vernierMicroHighEnc)
2713
2907
  if (microIsDiscreteScale) {
2714
2908
  const nextIdx = stepDiscreteIndex(sortedMicroAllowedDates, microUnit, currentHigh, currentLow, sortedMicroAllowedDates[sortedMicroAllowedDates.length - 1], delta, isHome, isEnd)
2715
2909
  if (nextIdx === findNearestDateIndex(sortedMicroAllowedDates, currentHigh, microUnit)) return
2716
- notifyMicroRange(currentLow, sortedMicroAllowedDates[nextIdx], true)
2910
+ notifyMicroSelection(currentLow, sortedMicroAllowedDates[nextIdx], true)
2717
2911
  return
2718
2912
  }
2719
2913
  let next: number
@@ -2721,7 +2915,22 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2721
2915
  else if (isEnd) next = vernierMicroMaxEnc
2722
2916
  else next = Math.max(vernierMicroLowEnc, Math.min(vernierMicroMaxEnc, vernierMicroHighEnc + delta))
2723
2917
  if (next === vernierMicroHighEnc) return
2724
- notifyMicroRange(currentLow, decode(microUnit, next), true)
2918
+ notifyMicroSelection(currentLow, decode(microUnit, next), true)
2919
+ } else if (handle === "micro-point") {
2920
+ // 時点は対になるつまみに塞がれない。可動域はミクロレールの両端そのもので、Home / End もその両端を指す
2921
+ const current = decode(microUnit, vernierMicroLowEnc)
2922
+ if (microIsDiscreteScale) {
2923
+ const nextIdx = stepDiscreteIndex(sortedMicroAllowedDates, microUnit, current, sortedMicroAllowedDates[0], sortedMicroAllowedDates[sortedMicroAllowedDates.length - 1], delta, isHome, isEnd)
2924
+ if (nextIdx === findNearestDateIndex(sortedMicroAllowedDates, current, microUnit)) return
2925
+ notifyMicroPoint(sortedMicroAllowedDates[nextIdx], true)
2926
+ return
2927
+ }
2928
+ let next: number
2929
+ if (isHome) next = vernierMicroMinEnc
2930
+ else if (isEnd) next = vernierMicroMaxEnc
2931
+ else next = Math.max(vernierMicroMinEnc, Math.min(vernierMicroMaxEnc, vernierMicroLowEnc + delta))
2932
+ if (next === vernierMicroLowEnc) return
2933
+ notifyMicroPoint(decode(microUnit, next), true)
2725
2934
  }
2726
2935
  }
2727
2936
 
@@ -2753,7 +2962,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2753
2962
  nextLowIdx = Math.max(0, maxIdx - idxSpan)
2754
2963
  }
2755
2964
  if (nextLowIdx !== curLowIdx || nextHighIdx !== curHighIdx) {
2756
- notifyMicroRange(sortedMicroAllowedDates[nextLowIdx], sortedMicroAllowedDates[nextHighIdx], true)
2965
+ notifyMicroSelection(sortedMicroAllowedDates[nextLowIdx], sortedMicroAllowedDates[nextHighIdx], true)
2757
2966
  }
2758
2967
  return
2759
2968
  }
@@ -2772,7 +2981,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2772
2981
  nextLow = Math.max(minEnc, nextHigh - span)
2773
2982
  }
2774
2983
  if (nextLow !== curLowEnc || nextHigh !== curHighEnc) {
2775
- notifyMicroRange(decode(microUnit, nextLow), decode(microUnit, nextHigh), true)
2984
+ notifyMicroSelection(decode(microUnit, nextLow), decode(microUnit, nextHigh), true)
2776
2985
  }
2777
2986
  } else {
2778
2987
  const span = currentHighVal - currentLowVal
@@ -2800,7 +3009,7 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2800
3009
  rangeMax,
2801
3010
  isControlled,
2802
3011
  notifyChange,
2803
- notifyMicroRange,
3012
+ notifyMicroSelection,
2804
3013
  vernierMicroLowEnc,
2805
3014
  vernierMicroHighEnc,
2806
3015
  vernierMicroMinEnc,
@@ -2854,7 +3063,9 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2854
3063
  // 符号化値が一致すればラベルは文字列まで一致する。しかもノギスには押し退けが無く 2 枚が同一矩形へ
2855
3064
  // 完全に重なるため、畳まないと同じ値が二重に読み上げられるだけで視覚的な情報も増えない
2856
3065
  const isVernierMacroLabelMerged = vernierMacroLowEnc === vernierMacroHighEnc
2857
- const isVernierMicroLabelMerged = vernierMicroLowEnc === vernierMicroHighEnc
3066
+ // 時点形態のミクロラベルは 1 枚しか無い。畳み込み判定は恒真になるため、Point モードの !isPointMode と
3067
+ // 同じ理由で形態ごと外す (外さないと唯一のラベルが重複として隠れる)
3068
+ const isVernierMicroLabelMerged = !isMicroPointShape && vernierMicroLowEnc === vernierMicroHighEnc
2858
3069
 
2859
3070
  // 生存者は対の内側だけで決める。frontVernierHandle は 4 つのつまみで 1 本しか無く、相手の対や
2860
3071
  // 連結バーを操作している間は対の両方が非 front になるため、「front でない方を隠す」では両方消える。
@@ -2881,9 +3092,13 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2881
3092
  [macroLowRatio, macroHighRatio, trackLength, macroRailLabelPosition, macroLabelSlantConfig, isVernierMacroLabelMerged, isVernierSlantable],
2882
3093
  )
2883
3094
 
3095
+ // 傾斜は接近した対を離すための機構であり、時点形態には離す相手が居ない。Point モードが
3096
+ // buildHorizontalSlantResult へ落ちるのと同じく、直立のまま置く
3097
+ const isMicroPairSlantable = isVernierSlantable && !isMicroPointShape
3098
+
2884
3099
  const microPairPlacement = useMemo(
2885
- () => solveVernierPairPlacement(microLowRatio, microHighRatio, trackLength, microRailLabelPosition, microLabelSlantConfig, isVernierMicroLabelMerged, isVernierSlantable),
2886
- [microLowRatio, microHighRatio, trackLength, microRailLabelPosition, microLabelSlantConfig, isVernierMicroLabelMerged, isVernierSlantable],
3100
+ () => solveVernierPairPlacement(microLowRatio, microHighRatio, trackLength, microRailLabelPosition, microLabelSlantConfig, isVernierMicroLabelMerged, isMicroPairSlantable),
3101
+ [microLowRatio, microHighRatio, trackLength, microRailLabelPosition, microLabelSlantConfig, isVernierMicroLabelMerged, isMicroPairSlantable],
2887
3102
  )
2888
3103
 
2889
3104
  const lowTooltipStyle: CSSProperties = useMemo(() => {
@@ -2964,6 +3179,9 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
2964
3179
  const stepperDecreaseDisabled = disabled || (isVernierMode ? vernierMicroLowEnc <= microStepFloorEnc : isPointMode ? currentLowVal <= rangeMin : currentLowVal <= rangeMin && currentHighVal <= rangeMin)
2965
3180
  const stepperIncreaseDisabled = disabled || (isVernierMode ? vernierMicroHighEnc >= microStepCeilEnc : isPointMode ? currentHighVal >= rangeMax : currentLowVal >= rangeMax && currentHighVal >= rangeMax)
2966
3181
 
3182
+ // ミクロレールの主つまみ。期間形態では下限つまみ、時点形態では唯一の時点つまみが同じ枠に立つ
3183
+ const microPrimaryHandle: "micro-low" | "micro-point" = isMicroPointShape ? "micro-point" : "micro-low"
3184
+
2967
3185
  const cursorClass = disabled ? "cursor-not-allowed opacity-50" : "cursor-pointer"
2968
3186
 
2969
3187
  // ------------------------------------------------------------------
@@ -3061,22 +3279,25 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
3061
3279
  }
3062
3280
  onPointerDown={handleVernierKnobPointerDown("macro-connect")}
3063
3281
  />
3064
- <div
3065
- data-testid="period-slider-connect-micro"
3066
- className="period-slider-connect-micro"
3067
- style={
3068
- isVertical
3069
- ? {
3070
- bottom: `calc(${microLowRatio * 100}% - 8px)`,
3071
- height: `calc(${Math.max(0, (microHighRatio - microLowRatio) * 100)}% + 16px)`,
3072
- }
3073
- : {
3074
- left: `calc(${microLowRatio * 100}% - 8px)`,
3075
- width: `calc(${Math.max(0, (microHighRatio - microLowRatio) * 100)}% + 16px)`,
3076
- }
3077
- }
3078
- onPointerDown={handleVernierKnobPointerDown("micro-connect")}
3079
- />
3282
+ {/* 時点形態のミクロ選択には幅が無い。帯を描くと「満タンの期間」に見え、掴める帯まで生えてしまう */}
3283
+ {!isMicroPointShape && (
3284
+ <div
3285
+ data-testid="period-slider-connect-micro"
3286
+ className="period-slider-connect-micro"
3287
+ style={
3288
+ isVertical
3289
+ ? {
3290
+ bottom: `calc(${microLowRatio * 100}% - 8px)`,
3291
+ height: `calc(${Math.max(0, (microHighRatio - microLowRatio) * 100)}% + 16px)`,
3292
+ }
3293
+ : {
3294
+ left: `calc(${microLowRatio * 100}% - 8px)`,
3295
+ width: `calc(${Math.max(0, (microHighRatio - microLowRatio) * 100)}% + 16px)`,
3296
+ }
3297
+ }
3298
+ onPointerDown={handleVernierKnobPointerDown("micro-connect")}
3299
+ />
3300
+ )}
3080
3301
  </>
3081
3302
  )}
3082
3303
 
@@ -3210,14 +3431,14 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
3210
3431
  )}
3211
3432
  </div>
3212
3433
 
3213
- {/* ミクロ下限ハンドル (下半円爪 / 右半円爪) */}
3434
+ {/* ミクロ主ハンドル: 期間形態は下限つまみ、時点形態は唯一の時点つまみ (下半円爪 / 右半円爪) */}
3214
3435
  <div
3215
3436
  tabIndex={disabled ? -1 : 0}
3216
3437
  role="slider"
3217
- aria-label={props.lowerAriaLabel ?? "Micro range start"}
3438
+ aria-label={isMicroPointShape ? (props.pointAriaLabel ?? "Micro selected date") : (props.lowerAriaLabel ?? "Micro range start")}
3218
3439
  aria-disabled={disabled ? "true" : undefined}
3219
3440
  aria-valuemin={vernierMicroMinEnc}
3220
- aria-valuemax={vernierMicroHighEnc}
3441
+ aria-valuemax={isMicroPointShape ? vernierMicroMaxEnc : vernierMicroHighEnc}
3221
3442
  aria-valuenow={vernierMicroLowEnc}
3222
3443
  aria-valuetext={props.formatAriaValueText ? props.formatAriaValueText(vernierMicroLowDate, microUnit) : formatScreenReaderLabel(microUnit, vernierMicroLowDate, formatMicroLabel, locale)}
3223
3444
  aria-orientation={isVertical ? "vertical" : "horizontal"}
@@ -3237,23 +3458,23 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
3237
3458
  left: isMacroFirstRail ? "auto" : 0,
3238
3459
  right: isMacroFirstRail ? 0 : "auto",
3239
3460
  transform: isMacroFirstRail ? "translate(100%, 50%)" : "translate(-100%, 50%)",
3240
- zIndex: activeVernierHandle === "micro-low" || frontVernierHandle === "micro-low" ? 30 : 20,
3461
+ zIndex: activeVernierHandle === microPrimaryHandle || frontVernierHandle === microPrimaryHandle ? 30 : 20,
3241
3462
  }
3242
3463
  : {
3243
3464
  left: `${microLowRatio * 100}%`,
3244
3465
  top: isMacroFirstRail ? "auto" : 0,
3245
3466
  bottom: isMacroFirstRail ? 0 : "auto",
3246
3467
  transform: isMacroFirstRail ? "translate(-50%, 100%)" : "translate(-50%, -100%)",
3247
- zIndex: activeVernierHandle === "micro-low" || frontVernierHandle === "micro-low" ? 30 : 20,
3468
+ zIndex: activeVernierHandle === microPrimaryHandle || frontVernierHandle === microPrimaryHandle ? 30 : 20,
3248
3469
  }
3249
3470
  }
3250
- onPointerDown={handleVernierKnobPointerDown("micro-low")}
3251
- onKeyDown={handleVernierKeyDown("micro-low")}
3252
- onFocus={handleVernierKnobFocus("micro-low")}
3253
- data-active={activeVernierHandle === "micro-low" ? "true" : undefined}
3254
- data-front={frontVernierHandle === "micro-low" ? "true" : undefined}
3471
+ onPointerDown={handleVernierKnobPointerDown(microPrimaryHandle)}
3472
+ onKeyDown={handleVernierKeyDown(microPrimaryHandle)}
3473
+ onFocus={handleVernierKnobFocus(microPrimaryHandle)}
3474
+ data-active={activeVernierHandle === microPrimaryHandle ? "true" : undefined}
3475
+ data-front={frontVernierHandle === microPrimaryHandle ? "true" : undefined}
3255
3476
  data-vernier-pos={isVertical ? (isMacroFirstRail ? "right" : "left") : isMacroFirstRail ? "bottom" : "top"}
3256
- data-handle-type="micro-low">
3477
+ data-handle-type={microPrimaryHandle}>
3257
3478
  <VernierKnobSvg type="micro" isTop={!isMacroFirstRail} isVertical={isVertical} isLeft={!isMacroFirstRail} />
3258
3479
  {showHairline && <div className="period-slider-hairline" />}
3259
3480
  {tooltipStyle !== "hover" && (
@@ -3269,64 +3490,66 @@ const PeriodSliderComponent: React.FC<PeriodSliderProps> = (props) => {
3269
3490
  )}
3270
3491
  </div>
3271
3492
 
3272
- {/* ミクロ上限ハンドル (下半円爪 / 右半円爪) */}
3273
- <div
3274
- tabIndex={disabled ? -1 : 0}
3275
- role="slider"
3276
- aria-label={props.upperAriaLabel ?? "Micro range end"}
3277
- aria-disabled={disabled ? "true" : undefined}
3278
- aria-valuemin={vernierMicroLowEnc}
3279
- aria-valuemax={vernierMicroMaxEnc}
3280
- aria-valuenow={vernierMicroHighEnc}
3281
- aria-valuetext={props.formatAriaValueText ? props.formatAriaValueText(vernierMicroHighDate, microUnit) : formatScreenReaderLabel(microUnit, vernierMicroHighDate, formatMicroLabel, locale)}
3282
- aria-orientation={isVertical ? "vertical" : "horizontal"}
3283
- className={`period-slider-handle period-slider-handle-vernier ${isVertical ? "is-vertical" : ""} group absolute touch-none ${
3284
- isVertical
3285
- ? isMacroFirstRail
3286
- ? "after:absolute after:-inset-y-3 after:-right-4 after:left-0"
3287
- : "after:absolute after:-inset-y-3 after:right-0 after:-left-4"
3288
- : isMacroFirstRail
3289
- ? "after:absolute after:-inset-x-3 after:top-0 after:-bottom-4"
3290
- : "after:absolute after:-inset-x-3 after:-top-4 after:bottom-0"
3291
- } after:content-[''] focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-600 focus-visible:ring-offset-2 ${cursorClass}`}
3292
- style={
3293
- isVertical
3294
- ? {
3295
- bottom: `${microHighRatio * 100}%`,
3296
- left: isMacroFirstRail ? "auto" : 0,
3297
- right: isMacroFirstRail ? 0 : "auto",
3298
- transform: isMacroFirstRail ? "translate(100%, 50%)" : "translate(-100%, 50%)",
3299
- zIndex: activeVernierHandle === "micro-high" || frontVernierHandle === "micro-high" ? 30 : 20,
3300
- }
3301
- : {
3302
- left: `${microHighRatio * 100}%`,
3303
- top: isMacroFirstRail ? "auto" : 0,
3304
- bottom: isMacroFirstRail ? 0 : "auto",
3305
- transform: isMacroFirstRail ? "translate(-50%, 100%)" : "translate(-50%, -100%)",
3306
- zIndex: activeVernierHandle === "micro-high" || frontVernierHandle === "micro-high" ? 30 : 20,
3307
- }
3308
- }
3309
- onPointerDown={handleVernierKnobPointerDown("micro-high")}
3310
- onKeyDown={handleVernierKeyDown("micro-high")}
3311
- onFocus={handleVernierKnobFocus("micro-high")}
3312
- data-active={activeVernierHandle === "micro-high" ? "true" : undefined}
3313
- data-front={frontVernierHandle === "micro-high" ? "true" : undefined}
3314
- data-vernier-pos={isVertical ? (isMacroFirstRail ? "right" : "left") : isMacroFirstRail ? "bottom" : "top"}
3315
- data-handle-type="micro-high">
3316
- <VernierKnobSvg type="micro" isTop={!isMacroFirstRail} isVertical={isVertical} isLeft={!isMacroFirstRail} />
3317
- {showHairline && <div className="period-slider-hairline" />}
3318
- {tooltipStyle !== "hover" && (
3319
- <div
3320
- className={`period-slider-tooltip absolute whitespace-nowrap font-medium shadow-md ${tooltipStyle === "balloon" ? "period-slider-tooltip-balloon" : ""}`}
3321
- data-tooltip-style={tooltipStyle}
3322
- data-duplicate={isVernierMicroHighLabelDuplicate ? "true" : undefined}
3323
- data-slanted={microPairPlacement.slant.isSlanted ? "true" : undefined}
3324
- ref={microHighLabelRef}
3325
- style={microPairPlacement.highStyle}>
3326
- {formatLabel(microUnit, vernierMicroHighDate, formatMicroLabel, locale)}
3327
- </div>
3328
- )}
3329
- </div>
3493
+ {/* ミクロ上限ハンドル (下半円爪 / 右半円爪)。時点形態には相方が居ないため描かない */}
3494
+ {!isMicroPointShape && (
3495
+ <div
3496
+ tabIndex={disabled ? -1 : 0}
3497
+ role="slider"
3498
+ aria-label={props.upperAriaLabel ?? "Micro range end"}
3499
+ aria-disabled={disabled ? "true" : undefined}
3500
+ aria-valuemin={vernierMicroLowEnc}
3501
+ aria-valuemax={vernierMicroMaxEnc}
3502
+ aria-valuenow={vernierMicroHighEnc}
3503
+ aria-valuetext={props.formatAriaValueText ? props.formatAriaValueText(vernierMicroHighDate, microUnit) : formatScreenReaderLabel(microUnit, vernierMicroHighDate, formatMicroLabel, locale)}
3504
+ aria-orientation={isVertical ? "vertical" : "horizontal"}
3505
+ className={`period-slider-handle period-slider-handle-vernier ${isVertical ? "is-vertical" : ""} group absolute touch-none ${
3506
+ isVertical
3507
+ ? isMacroFirstRail
3508
+ ? "after:absolute after:-inset-y-3 after:-right-4 after:left-0"
3509
+ : "after:absolute after:-inset-y-3 after:right-0 after:-left-4"
3510
+ : isMacroFirstRail
3511
+ ? "after:absolute after:-inset-x-3 after:top-0 after:-bottom-4"
3512
+ : "after:absolute after:-inset-x-3 after:-top-4 after:bottom-0"
3513
+ } after:content-[''] focus:outline-none focus-visible:ring-2 focus-visible:ring-blue-600 focus-visible:ring-offset-2 ${cursorClass}`}
3514
+ style={
3515
+ isVertical
3516
+ ? {
3517
+ bottom: `${microHighRatio * 100}%`,
3518
+ left: isMacroFirstRail ? "auto" : 0,
3519
+ right: isMacroFirstRail ? 0 : "auto",
3520
+ transform: isMacroFirstRail ? "translate(100%, 50%)" : "translate(-100%, 50%)",
3521
+ zIndex: activeVernierHandle === "micro-high" || frontVernierHandle === "micro-high" ? 30 : 20,
3522
+ }
3523
+ : {
3524
+ left: `${microHighRatio * 100}%`,
3525
+ top: isMacroFirstRail ? "auto" : 0,
3526
+ bottom: isMacroFirstRail ? 0 : "auto",
3527
+ transform: isMacroFirstRail ? "translate(-50%, 100%)" : "translate(-50%, -100%)",
3528
+ zIndex: activeVernierHandle === "micro-high" || frontVernierHandle === "micro-high" ? 30 : 20,
3529
+ }
3530
+ }
3531
+ onPointerDown={handleVernierKnobPointerDown("micro-high")}
3532
+ onKeyDown={handleVernierKeyDown("micro-high")}
3533
+ onFocus={handleVernierKnobFocus("micro-high")}
3534
+ data-active={activeVernierHandle === "micro-high" ? "true" : undefined}
3535
+ data-front={frontVernierHandle === "micro-high" ? "true" : undefined}
3536
+ data-vernier-pos={isVertical ? (isMacroFirstRail ? "right" : "left") : isMacroFirstRail ? "bottom" : "top"}
3537
+ data-handle-type="micro-high">
3538
+ <VernierKnobSvg type="micro" isTop={!isMacroFirstRail} isVertical={isVertical} isLeft={!isMacroFirstRail} />
3539
+ {showHairline && <div className="period-slider-hairline" />}
3540
+ {tooltipStyle !== "hover" && (
3541
+ <div
3542
+ className={`period-slider-tooltip absolute whitespace-nowrap font-medium shadow-md ${tooltipStyle === "balloon" ? "period-slider-tooltip-balloon" : ""}`}
3543
+ data-tooltip-style={tooltipStyle}
3544
+ data-duplicate={isVernierMicroHighLabelDuplicate ? "true" : undefined}
3545
+ data-slanted={microPairPlacement.slant.isSlanted ? "true" : undefined}
3546
+ ref={microHighLabelRef}
3547
+ style={microPairPlacement.highStyle}>
3548
+ {formatLabel(microUnit, vernierMicroHighDate, formatMicroLabel, locale)}
3549
+ </div>
3550
+ )}
3551
+ </div>
3552
+ )}
3330
3553
  </>
3331
3554
  ) : (
3332
3555
  <>
@@ -3548,6 +3771,9 @@ export const arePeriodSliderPropsEqual = (prev: PeriodSliderProps, next: PeriodS
3548
3771
  if ((prev.microRange?.[1]?.getTime() ?? null) !== (next.microRange?.[1]?.getTime() ?? null)) return false
3549
3772
  if ((prev.defaultMicroRange?.[0]?.getTime() ?? null) !== (next.defaultMicroRange?.[0]?.getTime() ?? null)) return false
3550
3773
  if ((prev.defaultMicroRange?.[1]?.getTime() ?? null) !== (next.defaultMicroRange?.[1]?.getTime() ?? null)) return false
3774
+ // 時点形態の選択も同じ判定を要する。ここを抜くと microValue を動かしても描画が据え置かれる
3775
+ if ((prev.microValue?.getTime() ?? null) !== (next.microValue?.getTime() ?? null)) return false
3776
+ if ((prev.defaultMicroValue?.getTime() ?? null) !== (next.defaultMicroValue?.getTime() ?? null)) return false
3551
3777
  if (prev.macroRange[0].getTime() !== next.macroRange[0].getTime()) return false
3552
3778
  if (prev.macroRange[1].getTime() !== next.macroRange[1].getTime()) return false
3553
3779
 
@@ -3563,6 +3789,7 @@ export const arePeriodSliderPropsEqual = (prev: PeriodSliderProps, next: PeriodS
3563
3789
  prev.formatMacroLabel !== next.formatMacroLabel ||
3564
3790
  prev.formatMicroLabel !== next.formatMicroLabel ||
3565
3791
  prev.onChangeMicroRange !== next.onChangeMicroRange ||
3792
+ prev.onChangeMicroPoint !== next.onChangeMicroPoint ||
3566
3793
  prev.onChangeMacroRange !== next.onChangeMacroRange
3567
3794
  ) {
3568
3795
  return false