mirror of
https://github.com/zadam/trilium.git
synced 2025-12-12 10:24:23 +01:00
feat(note_info): integrate near the note title
This commit is contained in:
parent
3561a4f14d
commit
3795ce2143
@ -14,6 +14,7 @@ import NoteLink from "./react/NoteLink";
|
|||||||
import link_context_menu from "../menus/link_context_menu";
|
import link_context_menu from "../menus/link_context_menu";
|
||||||
import { TitleEditor } from "./collections/board";
|
import { TitleEditor } from "./collections/board";
|
||||||
import server from "../services/server";
|
import server from "../services/server";
|
||||||
|
import { NoteInfoBadge } from "./BreadcrumbBadges";
|
||||||
|
|
||||||
const COLLAPSE_THRESHOLD = 5;
|
const COLLAPSE_THRESHOLD = 5;
|
||||||
const INITIAL_ITEMS = 2;
|
const INITIAL_ITEMS = 2;
|
||||||
@ -119,7 +120,10 @@ function BreadcrumbItem({ index, notePath, noteContext, notePathLength }: { inde
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (index === notePathLength - 1) {
|
if (index === notePathLength - 1) {
|
||||||
return <BreadcrumbLastItem notePath={notePath} />;
|
return <>
|
||||||
|
<BreadcrumbLastItem notePath={notePath} />
|
||||||
|
<NoteInfoBadge note={noteContext?.note} />
|
||||||
|
</>;
|
||||||
}
|
}
|
||||||
|
|
||||||
return <BreadcrumbLink notePath={notePath} />;
|
return <BreadcrumbLink notePath={notePath} />;
|
||||||
|
|||||||
@ -9,6 +9,7 @@
|
|||||||
flex-shrink: 1;
|
flex-shrink: 1;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
--badge-radius: 12px;
|
--badge-radius: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.breadcrumb-badge {
|
.breadcrumb-badge {
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -35,7 +36,7 @@
|
|||||||
&.backlinks-badge { color: var(--badge-text-color); }
|
&.backlinks-badge { color: var(--badge-text-color); }
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: inherit;
|
color: inherit !important;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,7 +48,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown {
|
.breadcrumb-dropdown-badge {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
@ -58,18 +59,7 @@
|
|||||||
min-width: 500px;
|
min-width: 500px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.breadcrumb-badge {
|
&.dropdown-note-info-badge {
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn {
|
|
||||||
border: 0;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.dropdown-note-info-badge {
|
|
||||||
.dropdown-menu.show ul {
|
.dropdown-menu.show ul {
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
padding: 0.5em;
|
padding: 0.5em;
|
||||||
@ -93,4 +83,13 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.breadcrumb-badge {
|
||||||
|
border-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
border: 0;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import { useIsNoteReadOnly, useNoteContext, useStaticTooltip } from "./react/hoo
|
|||||||
import Icon from "./react/Icon";
|
import Icon from "./react/Icon";
|
||||||
import { NoteSizeWidget, useNoteMetadata } from "./ribbon/NoteInfoTab";
|
import { NoteSizeWidget, useNoteMetadata } from "./ribbon/NoteInfoTab";
|
||||||
import { useShareInfo } from "./shared_info";
|
import { useShareInfo } from "./shared_info";
|
||||||
|
import FNote from "../entities/fnote";
|
||||||
|
|
||||||
export default function BreadcrumbBadges() {
|
export default function BreadcrumbBadges() {
|
||||||
return (
|
return (
|
||||||
@ -19,13 +20,11 @@ export default function BreadcrumbBadges() {
|
|||||||
<ReadOnlyBadge />
|
<ReadOnlyBadge />
|
||||||
<ShareBadge />
|
<ShareBadge />
|
||||||
<BacklinksBadge />
|
<BacklinksBadge />
|
||||||
<NoteInfoBadge />
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function NoteInfoBadge() {
|
export function NoteInfoBadge({ note }: { note: FNote | null | undefined }) {
|
||||||
const { note } = useNoteContext();
|
|
||||||
const { metadata, ...sizeProps } = useNoteMetadata(note);
|
const { metadata, ...sizeProps } = useNoteMetadata(note);
|
||||||
|
|
||||||
return (note &&
|
return (note &&
|
||||||
@ -156,7 +155,7 @@ function BadgeWithDropdown({ children, tooltip, className, dropdownOptions, ...p
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<Dropdown
|
<Dropdown
|
||||||
className={`dropdown-${className}`}
|
className={`breadcrumb-dropdown-badge dropdown-${className}`}
|
||||||
text={<Badge className={className} {...props} />}
|
text={<Badge className={className} {...props} />}
|
||||||
noDropdownListStyle
|
noDropdownListStyle
|
||||||
noSelectButtonStyle
|
noSelectButtonStyle
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user