Skip to content

Fix: date/time-trigger syntax leaking into filename on "New note from Card" #1222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yhbarve wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: date/time-trigger syntax leaking into filename on "New note from Card" #1222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion src/components/Item/ItemMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,28 @@ export function useItemMenu({
.setTitle(t('New note from card'))
.onClick(async () => {
const prevTitle = item.data.titleRaw.split('\n')[0].trim();
const dateTrigger = stateManager.getSetting('date-trigger') as string;
const timeTrigger = stateManager.getSetting('time-trigger') as string;
const shouldLinkDates = stateManager.getSetting('link-date-to-daily-note');
const dateContentMatch = shouldLinkDates
? '(?:\\[[^\\]]+\\]\\([^\\)]+\\)|\\[\\[[^\\]]+\\]\\])'
: '{[^}]+}';
const noteDateRegEx = new RegExp(
`(^|\\s)${escapeRegExpStr(dateTrigger)}${dateContentMatch}`,
'g'
);
const noteTimeRegEx = new RegExp(
`(^|\\s)${escapeRegExpStr(timeTrigger)}{[^}]+}`,
'g'
);

const sanitizedTitle = prevTitle
.replace(embedRegEx, '$1')
.replace(wikilinkRegEx, '$1')
.replace(mdLinkRegEx, '$1')
.replace(tagRegEx, '$1')
.replace(noteDateRegEx, '$1')
.replace(noteTimeRegEx, '$1')
.replace(illegalCharsRegEx, ' ')
.trim()
.replace(condenceWhiteSpaceRE, ' ');
Expand All @@ -85,8 +102,14 @@ export function useItemMenu({

await applyTemplate(stateManager, newNoteTemplatePath as string | undefined);

const matchTarget = prevTitle
.replace(noteDateRegEx, '$1')
.replace(noteTimeRegEx, '$1')
.trim()
.replace(condenceWhiteSpaceRE, ' ') || prevTitle;

const newTitleRaw = item.data.titleRaw.replace(
prevTitle,
matchTarget,
stateManager.app.fileManager.generateMarkdownLink(newFile, stateManager.file.path)
);

Expand Down