deepsky 2.58.3 → 2.58.6

package/dist/index.css

@@ -3251,83 +3251,77 @@ div[data-v-7371d421] {
 }
 
 
-.cube-timeline[data-v-34c2ac2f] { --timeline-line: color-mix(in srgb, var(--color) 20%, transparent); --timeline-default: color-mix(in srgb, var(--color) 52%, var(--page-bg)); --timeline-current: var(--selection-bg); --timeline-done: #22a06b; display: flex; flex-direction: column; margin: 0.5em 0; padding: 0.2em 0;
+.cube-timeline[data-v-266a962b] { --timeline-line: color-mix(in srgb, var(--color) 20%, transparent); --timeline-default: color-mix(in srgb, var(--color) 52%, var(--page-bg)); --timeline-current: var(--selection-bg); --timeline-done: #22a06b; display: flex; flex-direction: column; margin: 0.5em 0; padding: 0.2em 0;
 }
 .timeline-item {
-&[data-v-34c2ac2f] { display: grid; grid-template-columns: minmax(6.5em, 8.75em) 2.1em minmax(0, 1fr); min-height: 3.2em; transition: opacity 0.14s ease;
+&[data-v-266a962b] { display: grid; grid-template-columns: minmax(6.5em, 8.75em) 2.1em minmax(0, 1fr); min-height: 3.2em; transition: opacity 0.14s ease;
  }
-&:last-child .timeline-rail[data-v-34c2ac2f]::after { display: none;
+&:last-child .timeline-rail[data-v-266a962b]::after { display: none;
 }
-&.dragging[data-v-34c2ac2f] { opacity: 0.45;
+&.dragging[data-v-266a962b] { opacity: 0.45;
 }
-&.drop-target .timeline-main[data-v-34c2ac2f] { box-shadow: inset 0 2px 0 var(--timeline-current);
+&.drop-target .timeline-main[data-v-266a962b] { box-shadow: inset 0 2px 0 var(--timeline-current);
 }
 }
 .timeline-rail {
-&[data-v-34c2ac2f] { position: relative; display: flex; justify-content: center; padding-top: 0.2em;
+&[data-v-266a962b] { position: relative; display: flex; justify-content: center; padding-top: 0.2em;
  }
-&[data-v-34c2ac2f]::after { position: absolute; top: 1.95em; bottom: -0.2em; width: 1px; background: var(--timeline-line); content: "";
+&[data-v-266a962b]::after { position: absolute; top: 1.95em; bottom: -0.2em; width: 1px; background: var(--timeline-line); content: "";
 }
 }
-.line-dashed .timeline-rail[data-v-34c2ac2f]::after { background: repeating-linear-gradient(to bottom, var(--timeline-line) 0 4px, transparent 4px 8px);
+.line-dashed .timeline-rail[data-v-266a962b]::after { background: repeating-linear-gradient(to bottom, var(--timeline-line) 0 4px, transparent 4px 8px);
 }
 .timeline-marker {
-&[data-v-34c2ac2f] { z-index: 1; display: inline-flex; align-items: center; justify-content: center; width: 1.4em; height: 1.4em; padding: 0; border: 2px solid currentColor; border-radius: 50%; color: var(--timeline-default); background: var(--page-bg); cursor: grab; font-size: 0.88em; line-height: 1; touch-action: none; transition: transform 0.16s ease, box-shadow 0.16s ease;
+&[data-v-266a962b] { z-index: 1; display: inline-flex; align-items: center; justify-content: center; width: 1.4em; height: 1.4em; padding: 0; border: 2px solid currentColor; border-radius: 2px; color: var(--timeline-default); background: var(--page-bg); cursor: grab; font-size: 0.88em; line-height: 1; touch-action: none; transform: rotate(45deg); transition: transform 0.16s ease, box-shadow 0.16s ease;
  }
-&[data-v-34c2ac2f]:active { cursor: grabbing;
+> span[data-v-266a962b] { transform: rotate(-45deg);
 }
-&[data-v-34c2ac2f]:hover, &[data-v-34c2ac2f]:focus-visible { transform: scale(1.12); box-shadow: 0 0 0 3px color-mix(in srgb, currentColor 18%, transparent); outline: none;
+&[data-v-266a962b]:active { cursor: grabbing;
 }
+&[data-v-266a962b]:hover, &[data-v-266a962b]:focus-visible { transform: rotate(45deg) scale(1.12); box-shadow: 0 0 0 3px color-mix(in srgb, currentColor 18%, transparent); outline: none;
 }
-.state-current .timeline-marker[data-v-34c2ac2f] { color: var(--timeline-current); background: var(--timeline-current); box-shadow: 0 0 0 3px color-mix(in srgb, var(--timeline-current) 18%, transparent);
-}.state-done .timeline-marker[data-v-34c2ac2f] { border-color: var(--timeline-done); color: white; background: var(--timeline-done);
-}.marker-diamond .timeline-marker {
-&[data-v-34c2ac2f] { border-radius: 2px; transform: rotate(45deg);
- }
-> span[data-v-34c2ac2f] { transform: rotate(-45deg);
-}
-&[data-v-34c2ac2f]:hover, &[data-v-34c2ac2f]:focus-visible { transform: rotate(45deg) scale(1.12);
 }
-}.marker-flag .timeline-marker[data-v-34c2ac2f] { width: 1.55em; border-radius: 2px 2px 2px 0;
+.state-current .timeline-marker[data-v-266a962b] { color: var(--timeline-current); background: var(--timeline-current); box-shadow: 0 0 0 3px color-mix(in srgb, var(--timeline-current) 18%, transparent);
+}.state-done .timeline-marker[data-v-266a962b] { border-color: var(--timeline-done); color: white; background: var(--timeline-done);
 }
-.timeline-main[data-v-34c2ac2f] { min-width: 0; padding-bottom: 0.8em;
-}.timeline-meta[data-v-34c2ac2f] { display: flex; align-items: flex-start; justify-content: flex-end; align-self: start; min-width: 0; padding: 0.05em 0.35em 0 0;
+.timeline-main[data-v-266a962b] { min-width: 0; padding-bottom: 0.8em;
+}.timeline-meta[data-v-266a962b] { display: flex; align-items: flex-start; justify-content: flex-end; align-self: start; min-width: 0; padding: 0.05em 0.35em 0 0;
 }.timeline-time {
-&[data-v-34c2ac2f] { display: flex; flex: 0 1 auto; flex-direction: column; align-items: flex-end; min-width: 0; padding: 0; border: 0; color: color-mix(in srgb, var(--color) 68%, transparent); background: transparent; cursor: pointer; font-variant-numeric: tabular-nums; line-height: 1; transition: color 0.14s ease;
+&[data-v-266a962b] { display: flex; flex: 0 1 auto; flex-direction: column; align-items: flex-end; min-width: 0; padding: 0; border: 0; color: color-mix(in srgb, var(--color) 68%, transparent); background: transparent; cursor: pointer; font-variant-numeric: tabular-nums; line-height: 1; transition: color 0.14s ease;
  }
-&[data-v-34c2ac2f]:hover, &[data-v-34c2ac2f]:focus-visible { color: var(--selection-bg); outline: none;
+&[data-v-266a962b]:hover, &[data-v-266a962b]:focus-visible { color: var(--selection-bg); outline: none;
 }
-&.unscheduled[data-v-34c2ac2f] { color: color-mix(in srgb, var(--color) 42%, transparent); font-style: italic;
+&.unscheduled[data-v-266a962b] { color: color-mix(in srgb, var(--color) 42%, transparent); font-style: italic;
 }
-}.timeline-stamp[data-v-34c2ac2f] { display: flex; align-items: baseline; gap: 0.38em; white-space: nowrap;
-}.timeline-month[data-v-34c2ac2f] { color: color-mix(in srgb, currentColor 72%, transparent); font-size: 0.61em; font-weight: 700; letter-spacing: 0.11em; text-transform: uppercase;
-}.timeline-date[data-v-34c2ac2f] { font-size: 1.6em; font-weight: 680; letter-spacing: -0.035em;
-}.timeline-detail[data-v-34c2ac2f] { display: flex; align-items: center; gap: 0.38em; margin-top: 0.17em; color: color-mix(in srgb, var(--color) 57%, transparent); font-size: 0.65em; letter-spacing: 0.07em;
+}.timeline-stamp[data-v-266a962b] { display: flex; align-items: baseline; gap: 0.38em; white-space: nowrap;
+}.timeline-month[data-v-266a962b] { color: color-mix(in srgb, currentColor 72%, transparent); font-size: 0.61em; font-weight: 700; letter-spacing: 0.11em; text-transform: uppercase;
+}.timeline-date[data-v-266a962b] { font-size: 1.6em; font-weight: 680; letter-spacing: -0.035em;
+}.timeline-detail[data-v-266a962b] { display: flex; align-items: center; gap: 0.38em; margin-top: 0.17em; color: color-mix(in srgb, var(--color) 57%, transparent); font-size: 0.65em; letter-spacing: 0.07em;
 }.timeline-clock {
-&[data-v-34c2ac2f] { font-weight: 600; letter-spacing: 0.035em;
+&[data-v-266a962b] { font-weight: 600; letter-spacing: 0.035em;
  }
-&[data-v-34c2ac2f]::before { margin-right: 0.38em; color: color-mix(in srgb, currentColor 55%, transparent); content: "·";
+&[data-v-266a962b]::before { margin-right: 0.38em; color: color-mix(in srgb, currentColor 55%, transparent); content: "·";
 }
 }.timeline-box {
-&[data-v-34c2ac2f] { min-width: 0; border-radius: 6px;
+&[data-v-266a962b] { min-width: 0; border-radius: 6px;
  }
-&[data-v-34c2ac2f]:hover, &[data-v-34c2ac2f]:focus-within { background: color-mix(in srgb, var(--selection-bg) 5%, transparent);
+&[data-v-266a962b]:hover, &[data-v-266a962b]:focus-within { background: color-mix(in srgb, var(--selection-bg) 5%, transparent);
 }
 }@media (max-width: 560px) {
-.timeline-item[data-v-34c2ac2f] { grid-template-columns: minmax(5.6em, 7em) 1.8em minmax(0, 1fr);
-}.timeline-date[data-v-34c2ac2f] { font-size: 1.35em;
-}.timeline-month[data-v-34c2ac2f] { font-size: 0.56em;
+.timeline-item[data-v-266a962b] { grid-template-columns: minmax(5.6em, 7em) 1.8em minmax(0, 1fr);
+}.timeline-date[data-v-266a962b] { font-size: 1.35em;
+}.timeline-month[data-v-266a962b] { font-size: 0.56em;
 }
 }
-.timeline-item[data-v-34c2ac2f] { grid-template-columns: minmax(7.75em, 10.5em) 2.1em minmax(0, 1fr); min-height: 3.55em;
-}.timeline-month[data-v-34c2ac2f] { font-size: 0.72em;
-}.timeline-date[data-v-34c2ac2f] { font-size: 2.05em;
-}.timeline-detail[data-v-34c2ac2f] { margin-top: 0.22em; font-size: 0.76em;
+.timeline-item[data-v-266a962b] { grid-template-columns: minmax(7.75em, 10.5em) 2.1em minmax(0, 1fr); min-height: 3.55em;
+}.timeline-month[data-v-266a962b] { font-size: 0.72em;
+}.timeline-date[data-v-266a962b] { font-size: 2.05em;
+}.timeline-detail[data-v-266a962b] { margin-top: 0.22em; font-size: 0.76em;
 }@media (max-width: 560px) {
-.timeline-item[data-v-34c2ac2f] { grid-template-columns: minmax(6.5em, 8.25em) 1.8em minmax(0, 1fr); min-height: 3.35em;
-}.timeline-month[data-v-34c2ac2f] { font-size: 0.62em;
-}.timeline-date[data-v-34c2ac2f] { font-size: 1.65em;
-}.timeline-detail[data-v-34c2ac2f] { font-size: 0.69em;
+.timeline-item[data-v-266a962b] { grid-template-columns: minmax(6.5em, 8.25em) 1.8em minmax(0, 1fr); min-height: 3.35em;
+}.timeline-month[data-v-266a962b] { font-size: 0.62em;
+}.timeline-date[data-v-266a962b] { font-size: 1.65em;
+}.timeline-detail[data-v-266a962b] { font-size: 0.69em;
 }
 }
 
@@ -5908,34 +5902,6 @@ button[data-v-ab860aaa] { padding: 8px 12px; border-radius: 7px; cursor: pointer
 }
 
 
-.timeline-overlay[data-v-a3979f46] { position: fixed; inset: 0; z-index: var(--float-zindex); display: flex; align-items: center; justify-content: center; padding: 16px; background: rgba(0, 0, 0, 0.35);
-}.timeline-dialog[data-v-a3979f46] { position: relative; width: min(520px, calc(100vw - 32px)); padding: 22px; border: var(--dialog-cubelist-border); border-radius: 12px; color: var(--dialog-cubelist-input-color); background: var(--dialog-cubelist-bg); box-shadow: var(--dialog-cubelist-box-shadow);
-}.close-corner[data-v-a3979f46] { position: absolute; top: 10px; right: 10px; border: 0; color: inherit; background: transparent; cursor: pointer;
-}header {
-&[data-v-a3979f46] { margin-bottom: 16px;
- }
-h2[data-v-a3979f46], p[data-v-a3979f46] { margin: 0;
-}
-p[data-v-a3979f46] { margin-top: 5px; font-size: 13px; opacity: 0.7;
-}
-}.fields {
-&[data-v-a3979f46] { display: grid; grid-template-columns: 1fr 1fr; gap: 12px;
- }
-label[data-v-a3979f46] { display: flex; flex-direction: column; gap: 5px; font-size: 12px;
-}
-input[data-v-a3979f46], select[data-v-a3979f46] { height: 34px; box-sizing: border-box; padding: 0 8px; border: var(--menu-dialog-input-border); border-radius: 6px; color: inherit; background: transparent;
-}
-}.check[data-v-a3979f46] { display: flex; align-items: center; gap: 6px; margin-top: 14px; font-size: 13px;
-}.actions {
-&[data-v-a3979f46] { display: flex; justify-content: flex-end; gap: 8px; margin-top: 18px;
- }
-button[data-v-a3979f46] { padding: 8px 12px; border-radius: 7px; cursor: pointer;
-}.secondary[data-v-a3979f46] { border: var(--menu-dialog-input-border); color: inherit; background: transparent;
-}.primary[data-v-a3979f46] { border: 1px solid var(--menu-item-active-color); color: var(--menu-dialog-bg); background: var(--menu-item-active-color);
-}
-}
-
-
 .datetime-overlay[data-v-00eff53f] { position: fixed; z-index: calc(var(--float-zindex) + 1); inset: 0; display: flex; align-items: center; justify-content: center; padding: 16px; background: rgb(0 0 0 / 0.35);
 }.datetime-dialog[data-v-00eff53f] { position: relative; max-width: calc(100vw - 32px);
 }.dialog-header {

package/dist/index.d.ts

@@ -514,17 +514,6 @@ declare class DialogCounter extends DialogBase {
     close(return_cursor?: boolean): void;
 }
 
-declare class DialogTimeline extends DialogBase {
-    protected _cube: Ref<CubeTimeline | null>;
-    protected _attrs: Ref<ITimeline.Attrs | null>;
-    constructor(note: Note);
-    get cube(): CubeTimeline | null;
-    get attrs(): ITimeline.Attrs | null;
-    edit_timeline(cube: CubeTimeline): void;
-    save(): void;
-    close(return_cursor?: boolean): void;
-}
-
 interface DatetimeDialogOptions {
     value: number | null;
     allow_empty?: boolean;
@@ -1414,7 +1403,6 @@ declare class UIDialog extends UiBase {
     protected _rating: DialogRating;
     protected _key: DialogKey;
     protected _counter: DialogCounter;
-    protected _timeline: DialogTimeline;
     protected _datetime: DialogDatetime;
     protected _confirm: DialogConfirm;
     protected _img_comment: DialogImgComment;
@@ -1443,7 +1431,6 @@ declare class UIDialog extends UiBase {
     get rating(): DialogRating;
     get key(): DialogKey;
     get counter(): DialogCounter;
-    get timeline(): DialogTimeline;
     get datetime(): DialogDatetime;
     get confirm(): DialogConfirm;
     get img_comment(): DialogImgComment;
@@ -3363,7 +3350,6 @@ declare class CubeMusic extends CubeChild<IMusic.Data> {
     get is_empty(): boolean;
     get text(): string;
     build_child(): void;
-    protected lyric_asset_type(lyric: IMusic.Resource): IMusic.LyricAssetType;
     protected retain_tracks(tracks: IMusic.Track[]): void;
     protected release_tracks(tracks: IMusic.Track[]): void;
     get_valid_index(pos: number): number;
@@ -4324,6 +4310,8 @@ declare class TimelineStatus extends CubeStatusBase<ITimeline.Data> {
 }
 
 declare class ReceiverTimeline extends ReceiverChild<CubeTimeline> {
+    protected delete_edge(command: ICommandCube.DeleteEdge): Recorder;
+    protected merge(command: ICommandCube.Merge): Recorder;
     protected insert_item(command: ICommandTimeline.Insert): Recorder | undefined;
     protected remove(command: ICommandTimeline.Remove): Recorder | undefined;
     protected move(command: ICommandTimeline.Move): Recorder | undefined;
@@ -4347,6 +4335,7 @@ declare class CubeTimeline extends CubeChild<ITimeline.Data> {
     get items(): TimelineItem[];
     get children(): CubeChild[];
     protected get atomic_child(): readonly string[];
+    get can_merge(): boolean;
     get text(): string;
     build_child(data: ITimeline.Data): void;
     create(data: ITimeline.ItemData[]): TimelineItem[];
@@ -6367,16 +6356,12 @@ declare namespace ICommandFiles {
 
 declare namespace IMusic {
     type PlayOrder = "sequence" | "list-loop" | "single-loop" | "shuffle";
-    /** Legacy lyrics may still live in the generic attachment directory. */
-    type LyricAssetType = "audio" | "attach";
     /** A binary resource stored by the note asset service. */
     interface Resource {
         key: string;
         name: string;
         mime?: string;
         size: number;
-        /** Only used by lyric resources; absent values are treated as legacy attachments. */
-        asset_type?: LyricAssetType;
     }
     /** One ordered playlist entry. Its identity is audio.key. */
     interface Track {
@@ -6878,9 +6863,7 @@ declare namespace ITimeline {
         data: IBox.Data;
     }
     interface Attrs extends ICubeBase.Attrs {
-        marker: Marker;
         line_style: LineStyle;
-        show_time: boolean;
         time_format: TimeFormat;
         [key: string]: any;
     }
@@ -6889,11 +6872,6 @@ declare namespace ITimeline {
         current = "current",
         done = "done"
     }
-    enum Marker {
-        dot = "dot",
-        diamond = "diamond",
-        flag = "flag"
-    }
     enum LineStyle {
         solid = "solid",
         dashed = "dashed"