rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/10.13.0'

Browse Source
This commit is contained in:
Mo
2022-02-22 14:16:43 -06:00
parent 4c8111ff6f 3d6c10b70e
commit 4f4f23f3be
19 changed files with 589 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/ApplicationView.tsx
View File

@@ -26,6 +26,7 @@ import { PermissionsModal } from './PermissionsModal';
import { RevisionHistoryModalWrapper } from './RevisionHistoryModal/RevisionHistoryModalWrapper'; import { RevisionHistoryModalWrapper } from './RevisionHistoryModal/RevisionHistoryModalWrapper';
import { PremiumModalProvider } from './Premium'; import { PremiumModalProvider } from './Premium';
import { ConfirmSignoutContainer } from './ConfirmSignoutModal'; import { ConfirmSignoutContainer } from './ConfirmSignoutModal';
import { TagsContextMenu } from './Tags/TagContextMenu';
type Props = { type Props = {
application: WebApplication; application: WebApplication;
@@ -268,6 +269,8 @@ export class ApplicationView extends PureComponent<Props, State> {
appState={this.appState} appState={this.appState}
/> />
<TagsContextMenu appState={this.appState} />
<PurchaseFlowWrapper <PurchaseFlowWrapper
application={this.application} application={this.application}
appState={this.appState} appState={this.appState}

4
app/assets/javascripts/components/Icon.tsx
View File

@@ -44,6 +44,8 @@ import {
NotesIcon, NotesIcon,
PasswordIcon, PasswordIcon,
PencilOffIcon, PencilOffIcon,
PencilFilledIcon,
PencilIcon,
PinFilledIcon, PinFilledIcon,
PinIcon, PinIcon,
PlainTextIcon, PlainTextIcon,
@@ -91,6 +93,7 @@ const ICONS = {
'menu-arrow-right': MenuArrowRight, 'menu-arrow-right': MenuArrowRight,
'menu-close': MenuCloseIcon, 'menu-close': MenuCloseIcon,
'pencil-off': PencilOffIcon, 'pencil-off': PencilOffIcon,
'pencil-filled': PencilFilledIcon,
'pin-filled': PinFilledIcon, 'pin-filled': PinFilledIcon,
'plain-text': PlainTextIcon, 'plain-text': PlainTextIcon,
'premium-feature': PremiumFeatureIcon, 'premium-feature': PremiumFeatureIcon,
@@ -122,6 +125,7 @@ const ICONS = {
more: MoreIcon, more: MoreIcon,
notes: NotesIcon, notes: NotesIcon,
password: PasswordIcon, password: PasswordIcon,
pencil: PencilIcon,
pin: PinIcon, pin: PinIcon,
restore: RestoreIcon, restore: RestoreIcon,
security: SecurityIcon, security: SecurityIcon,

30
app/assets/javascripts/components/NoteView/NoteView.tsx
View File

@@ -1055,21 +1055,23 @@ export class NoteView extends PureComponent<Props, State> {
</div> </div>
</div> </div>
<div className="flex items-center"> <div className="flex items-center">
<div id="save-status"> <div id="save-status-container">
<div <div id="save-status">
className={ <div
(this.state.syncTakingTooLong className={
? 'warning sk-bold ' (this.state.syncTakingTooLong
: '') + ? 'warning sk-bold '
(this.state.saveError ? 'danger sk-bold ' : '') + : '') +
' message' (this.state.saveError ? 'danger sk-bold ' : '') +
} ' message'
> }
{this.state.noteStatus?.message} >
{this.state.noteStatus?.message}
</div>
{this.state.noteStatus?.desc && (
<div className="desc">{this.state.noteStatus.desc}</div>
)}
</div> </div>
{this.state.noteStatus?.desc && (
<div className="desc">{this.state.noteStatus.desc}</div>
)}
</div> </div>
<div className="mr-3"> <div className="mr-3">
<ChangeEditorButton <ChangeEditorButton

2
app/assets/javascripts/components/NotesOptionsPanel.tsx
View File

@@ -11,6 +11,7 @@ import { useRef, useState } from 'preact/hooks';
import { observer } from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import { NotesOptions } from './NotesOptions/NotesOptions'; import { NotesOptions } from './NotesOptions/NotesOptions';
import { WebApplication } from '@/ui_models/application'; import { WebApplication } from '@/ui_models/application';
import { FOCUSABLE_BUT_NOT_TABBABLE } from '@/constants';
type Props = { type Props = {
application: WebApplication; application: WebApplication;
@@ -88,6 +89,7 @@ export const NotesOptionsPanel = observer(
}} }}
className="sn-dropdown sn-dropdown--animated min-w-80 max-h-120 max-w-xs flex flex-col pt-2 overflow-y-auto fixed" className="sn-dropdown sn-dropdown--animated min-w-80 max-h-120 max-w-xs flex flex-col pt-2 overflow-y-auto fixed"
onBlur={closeOnBlur} onBlur={closeOnBlur}
tabIndex={FOCUSABLE_BUT_NOT_TABBABLE}
> >
{open && ( {open && (
<NotesOptions <NotesOptions

3
app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx
View File

@@ -146,7 +146,8 @@ export const QuickSettingsMenu: FunctionComponent<MenuProps> = observer(
(component) => (component) =>
[ComponentArea.EditorStack, ComponentArea.TagsList].includes( [ComponentArea.EditorStack, ComponentArea.TagsList].includes(
component.area component.area
) && component.identifier !== FeatureIdentifier.FoldersComponent ) &&
component.identifier !== FeatureIdentifier.DeprecatedFoldersComponent
); );
setToggleableComponents(toggleableComponents); setToggleableComponents(toggleableComponents);
}, [application]); }, [application]);

9
app/assets/javascripts/components/RevisionHistoryModal/SelectedRevisionContent.tsx
View File

@@ -64,11 +64,14 @@ export const SelectedRevisionContent: FunctionComponent<SelectedRevisionContentP
</div> </div>
</div> </div>
{!componentViewer && ( {!componentViewer && (
<div className="relative flex-grow min-h-0 overflow-x-hidden overflow-y-auto"> <div className="relative flex-grow min-h-0 overflow-hidden">
{selectedRevision.payload.content.text.length ? ( {selectedRevision.payload.content.text.length ? (
<p className="p-4 pt-0 color-text text-editor font-editor"> <textarea
readOnly={true}
className="w-full h-full resize-none p-4 pt-0 border-0 color-text text-editor font-editor"
>
{selectedRevision.payload.content.text} {selectedRevision.payload.content.text}
</p> </textarea>
) : ( ) : (
<div className={`color-grey-0 ${ABSOLUTE_CENTER_CLASSNAME}`}> <div className={`color-grey-0 ${ABSOLUTE_CENTER_CLASSNAME}`}>
Empty note. Empty note.

3
app/assets/javascripts/components/Tags/SmartTagsListItem.tsx
View File

@@ -84,7 +84,7 @@ export const SmartTagsListItem: FunctionComponent<Props> = observer(
}, [inputRef]); }, [inputRef]);
const onClickDelete = useCallback(() => { const onClickDelete = useCallback(() => {
tagsState.remove(tag); tagsState.remove(tag, true);
}, [tagsState, tag]); }, [tagsState, tag]);
const isFaded = !tag.isAllTag; const isFaded = !tag.isAllTag;
@@ -111,6 +111,7 @@ export const SmartTagsListItem: FunctionComponent<Props> = observer(
</div> </div>
<input <input
className={`title ${isEditing ? 'editing' : ''}`} className={`title ${isEditing ? 'editing' : ''}`}
disabled={!isEditing}
id={`react-tag-${tag.uuid}`} id={`react-tag-${tag.uuid}`}
onBlur={onBlur} onBlur={onBlur}
onInput={onInput} onInput={onInput}

102
app/assets/javascripts/components/Tags/TagContextMenu.tsx Normal file
View File

@@ -0,0 +1,102 @@
import { AppState } from '@/ui_models/app_state';
import { observer } from 'mobx-react-lite';
import { FunctionComponent } from 'preact';
import { useCallback, useEffect, useRef } from 'preact/hooks';
import { Icon } from '../Icon';
import { Menu } from '../menu/Menu';
import { MenuItem, MenuItemType } from '../menu/MenuItem';
import { useCloseOnBlur } from '../utils';
type Props = {
appState: AppState;
};
export const TagsContextMenu: FunctionComponent<Props> = observer(
({ appState }) => {
const selectedTag = appState.tags.selected;
if (!selectedTag) {
return null;
}
const { contextMenuOpen, contextMenuPosition, contextMenuMaxHeight } =
appState.tags;
const contextMenuRef = useRef<HTMLDivElement>(null);
const [closeOnBlur] = useCloseOnBlur(contextMenuRef, (open: boolean) =>
appState.tags.setContextMenuOpen(open)
);
const reloadContextMenuLayout = useCallback(() => {
appState.tags.reloadContextMenuLayout();
}, [appState.tags]);
useEffect(() => {
window.addEventListener('resize', reloadContextMenuLayout);
return () => {
window.removeEventListener('resize', reloadContextMenuLayout);
};
}, [reloadContextMenuLayout]);
const onClickAddSubtag = useCallback(() => {
appState.tags.setContextMenuOpen(false);
appState.tags.setAddingSubtagTo(selectedTag);
}, [appState.tags, selectedTag]);
const onClickRename = useCallback(() => {
appState.tags.setContextMenuOpen(false);
appState.tags.editingTag = selectedTag;
}, [appState.tags, selectedTag]);
const onClickDelete = useCallback(() => {
appState.tags.remove(selectedTag, true);
}, [appState.tags, selectedTag]);
return contextMenuOpen ? (
<div
ref={contextMenuRef}
className="sn-dropdown min-w-60 max-h-120 max-w-xs flex flex-col py-2 overflow-y-auto fixed"
style={{
...contextMenuPosition,
maxHeight: contextMenuMaxHeight,
}}
>
<Menu
a11yLabel="Tag context menu"
isOpen={contextMenuOpen}
closeMenu={() => {
appState.tags.setContextMenuOpen(false);
}}
>
<MenuItem
type={MenuItemType.IconButton}
onBlur={closeOnBlur}
className={`py-1.5`}
onClick={onClickAddSubtag}
>
<Icon type="add" className="color-neutral mr-2" />
Add subtag
</MenuItem>
<MenuItem
type={MenuItemType.IconButton}
onBlur={closeOnBlur}
className={`py-1.5`}
onClick={onClickRename}
>
<Icon type="pencil-filled" className="color-neutral mr-2" />
Rename
</MenuItem>
<MenuItem
type={MenuItemType.IconButton}
onBlur={closeOnBlur}
className={`py-1.5`}
onClick={onClickDelete}
>
<Icon type="trash" className="mr-2 color-danger" />
<span className="color-danger">Delete</span>
</MenuItem>
</Menu>
</div>
) : null;
}
);

16
app/assets/javascripts/components/Tags/TagsList.tsx
View File

@@ -1,5 +1,6 @@
import { AppState } from '@/ui_models/app_state'; import { AppState } from '@/ui_models/app_state';
import { isMobile } from '@/utils'; import { isMobile } from '@/utils';
import { SNTag } from '@standardnotes/snjs';
import { observer } from 'mobx-react-lite'; import { observer } from 'mobx-react-lite';
import { FunctionComponent } from 'preact'; import { FunctionComponent } from 'preact';
import { DndProvider } from 'react-dnd'; import { DndProvider } from 'react-dnd';
@@ -18,6 +19,20 @@ export const TagsList: FunctionComponent<Props> = observer(({ appState }) => {
const backend = isMobile({ tablet: true }) ? TouchBackend : HTML5Backend; const backend = isMobile({ tablet: true }) ? TouchBackend : HTML5Backend;
const openTagContextMenu = (posX: number, posY: number) => {
appState.tags.setContextMenuClickLocation({
x: posX,
y: posY,
});
appState.tags.reloadContextMenuLayout();
appState.tags.setContextMenuOpen(true);
};
const onContextMenu = (tag: SNTag, posX: number, posY: number) => {
appState.tags.selected = tag;
openTagContextMenu(posX, posY);
};
return ( return (
<DndProvider backend={backend}> <DndProvider backend={backend}>
{allTags.length === 0 ? ( {allTags.length === 0 ? (
@@ -34,6 +49,7 @@ export const TagsList: FunctionComponent<Props> = observer(({ appState }) => {
tag={tag} tag={tag}
tagsState={tagsState} tagsState={tagsState}
features={appState.features} features={appState.features}
onContextMenu={onContextMenu}
/> />
); );
})} })}

160
app/assets/javascripts/components/Tags/TagsListItem.tsx
View File

@@ -1,5 +1,6 @@
import { Icon } from '@/components/Icon'; import { Icon } from '@/components/Icon';
import { usePremiumModal } from '@/components/Premium'; import { usePremiumModal } from '@/components/Premium';
import { KeyboardKey } from '@/services/ioService';
import { import {
FeaturesState, FeaturesState,
TAG_FOLDERS_FEATURE_NAME, TAG_FOLDERS_FEATURE_NAME,
@@ -19,18 +20,23 @@ type Props = {
tagsState: TagsState; tagsState: TagsState;
features: FeaturesState; features: FeaturesState;
level: number; level: number;
onContextMenu: (tag: SNTag, posX: number, posY: number) => void;
}; };
const PADDING_BASE_PX = 14; const PADDING_BASE_PX = 14;
const PADDING_PER_LEVEL_PX = 21; const PADDING_PER_LEVEL_PX = 21;
export const TagsListItem: FunctionComponent<Props> = observer( export const TagsListItem: FunctionComponent<Props> = observer(
({ tag, features, tagsState, level }) => { ({ tag, features, tagsState, level, onContextMenu }) => {
const [title, setTitle] = useState(tag.title || ''); const [title, setTitle] = useState(tag.title || '');
const [subtagTitle, setSubtagTitle] = useState('');
const inputRef = useRef<HTMLInputElement>(null); const inputRef = useRef<HTMLInputElement>(null);
const subtagInputRef = useRef<HTMLInputElement>(null);
const menuButtonRef = useRef<HTMLButtonElement>(null);
const isSelected = tagsState.selected === tag; const isSelected = tagsState.selected === tag;
const isEditing = tagsState.editingTag === tag; const isEditing = tagsState.editingTag === tag;
const isAddingSubtag = tagsState.addingSubtagTo === tag;
const noteCounts = computed(() => tagsState.getNotesCount(tag)); const noteCounts = computed(() => tagsState.getNotesCount(tag));
const childrenTags = computed(() => tagsState.getChildren(tag)).get(); const childrenTags = computed(() => tagsState.getChildren(tag)).get();
@@ -83,9 +89,9 @@ export const TagsListItem: FunctionComponent<Props> = observer(
[setTitle] [setTitle]
); );
const onKeyUp = useCallback( const onKeyDown = useCallback(
(e: KeyboardEvent) => { (e: KeyboardEvent) => {
if (e.code === 'Enter') { if (e.key === KeyboardKey.Enter) {
inputRef.current?.blur(); inputRef.current?.blur();
e.preventDefault(); e.preventDefault();
} }
@@ -99,17 +105,34 @@ export const TagsListItem: FunctionComponent<Props> = observer(
} }
}, [inputRef, isEditing]); }, [inputRef, isEditing]);
const onClickRename = useCallback(() => { const onSubtagInput = useCallback(
tagsState.editingTag = tag; (e: JSX.TargetedEvent<HTMLInputElement>) => {
}, [tagsState, tag]); const value = (e.target as HTMLInputElement).value;
setSubtagTitle(value);
},
[]
);
const onClickSave = useCallback(() => { const onSubtagInputBlur = useCallback(() => {
inputRef.current?.blur(); tagsState.createSubtagAndAssignParent(tag, subtagTitle);
}, [inputRef]); setSubtagTitle('');
}, [subtagTitle, tag, tagsState]);
const onClickDelete = useCallback(() => { const onSubtagKeyDown = useCallback(
tagsState.remove(tag); (e: KeyboardEvent) => {
}, [tagsState, tag]); if (e.key === KeyboardKey.Enter) {
e.preventDefault();
subtagInputRef.current?.blur();
}
},
[subtagInputRef]
);
useEffect(() => {
if (isAddingSubtag) {
subtagInputRef.current?.focus();
}
}, [subtagInputRef, isAddingSubtag]);
const [, dragRef] = useDrag( const [, dragRef] = useDrag(
() => ({ () => ({
@@ -148,10 +171,25 @@ export const TagsListItem: FunctionComponent<Props> = observer(
const readyToDrop = isOver && canDrop; const readyToDrop = isOver && canDrop;
const toggleContextMenu = () => {
if (!menuButtonRef.current) {
return;
}
const contextMenuOpen = tagsState.contextMenuOpen;
const menuButtonRect = menuButtonRef.current?.getBoundingClientRect();
if (contextMenuOpen) {
tagsState.setContextMenuOpen(false);
} else {
onContextMenu(tag, menuButtonRect.right, menuButtonRect.top);
}
};
return ( return (
<> <>
<div <button
className={`tag ${isSelected ? 'selected' : ''} ${ className={`tag focus:shadow-inner ${isSelected ? 'selected' : ''} ${
readyToDrop ? 'is-drag-over' : '' readyToDrop ? 'is-drag-over' : ''
}`} }`}
onClick={selectCurrentTag} onClick={selectCurrentTag}
@@ -159,23 +197,33 @@ export const TagsListItem: FunctionComponent<Props> = observer(
style={{ style={{
paddingLeft: `${level * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`, paddingLeft: `${level * PADDING_PER_LEVEL_PX + PADDING_BASE_PX}px`,
}} }}
onContextMenu={(e: MouseEvent) => {
e.preventDefault();
onContextMenu(tag, e.clientX, e.clientY);
}}
> >
{!tag.errorDecrypting ? ( {!tag.errorDecrypting ? (
<div className="tag-info" title={title} ref={dropRef}> <div className="tag-info" title={title} ref={dropRef}>
{hasAtLeastOneFolder && ( {hasAtLeastOneFolder && (
<div <div className="tag-fold-container">
className={`tag-fold ${showChildren ? 'opened' : 'closed'}`} <button
onClick={hasChildren ? toggleChildren : undefined} className={`tag-fold focus:shadow-inner ${
> showChildren ? 'opened' : 'closed'
<Icon } ${!hasChildren ? 'invisible' : ''}`}
className={`color-neutral ${!hasChildren ? 'hidden' : ''}`} onClick={hasChildren ? toggleChildren : undefined}
type={ >
showChildren ? 'menu-arrow-down-alt' : 'menu-arrow-right' <Icon
} className={`color-neutral`}
/> type={
showChildren
? 'menu-arrow-down-alt'
: 'menu-arrow-right'
}
/>
</button>
</div> </div>
)} )}
<div className={`tag-icon ${'draggable'} mr-1`} ref={dragRef}> <div className={`tag-icon draggable mr-1`} ref={dragRef}>
<Icon <Icon
type="hashtag" type="hashtag"
className={`${isSelected ? 'color-info' : 'color-neutral'}`} className={`${isSelected ? 'color-info' : 'color-neutral'}`}
@@ -184,14 +232,26 @@ export const TagsListItem: FunctionComponent<Props> = observer(
<input <input
className={`title ${isEditing ? 'editing' : ''}`} className={`title ${isEditing ? 'editing' : ''}`}
id={`react-tag-${tag.uuid}`} id={`react-tag-${tag.uuid}`}
disabled={!isEditing}
onBlur={onBlur} onBlur={onBlur}
onInput={onInput} onInput={onInput}
value={title} value={title}
onKeyUp={onKeyUp} onKeyDown={onKeyDown}
spellCheck={false} spellCheck={false}
ref={inputRef} ref={inputRef}
/> />
<div className="count">{noteCounts.get()}</div> <div className="flex items-center">
<button
className={`border-0 mr-2 bg-transparent hover:bg-contrast focus:shadow-inner cursor-pointer ${
isSelected ? 'visible' : 'invisible'
}`}
onClick={toggleContextMenu}
ref={menuButtonRef}
>
<Icon type="more" className="color-neutral" />
</button>
<div className="count">{noteCounts.get()}</div>
</div>
</div> </div>
) : null} ) : null}
<div className={`meta ${hasAtLeastOneFolder ? 'with-folders' : ''}`}> <div className={`meta ${hasAtLeastOneFolder ? 'with-folders' : ''}`}>
@@ -206,25 +266,34 @@ export const TagsListItem: FunctionComponent<Props> = observer(
{tag.errorDecrypting && tag.waitingForKey && ( {tag.errorDecrypting && tag.waitingForKey && (
<div className="info small-text font-bold">Waiting For Keys</div> <div className="info small-text font-bold">Waiting For Keys</div>
)} )}
{isSelected && (
<div className="menu">
{!isEditing && (
<a className="item" onClick={onClickRename}>
Rename
</a>
)}
{isEditing && (
<a className="item" onClick={onClickSave}>
Save
</a>
)}
<a className="item" onClick={onClickDelete}>
Delete
</a>
</div>
)}
</div> </div>
</div> </button>
{isAddingSubtag && (
<div
className="tag overflow-hidden"
style={{
paddingLeft: `${
(level + 1) * PADDING_PER_LEVEL_PX + PADDING_BASE_PX
}px`,
}}
>
<div className="tag-info">
<div className="tag-fold" />
<div className="tag-icon mr-1">
<Icon type="hashtag" className="color-neutral mr-1" />
</div>
<input
className="title w-full focus:shadow-none"
type="text"
ref={subtagInputRef}
onBlur={onSubtagInputBlur}
onKeyDown={onSubtagKeyDown}
value={subtagTitle}
onInput={onSubtagInput}
/>
</div>
</div>
)}
{showChildren && ( {showChildren && (
<> <>
{childrenTags.map((tag) => { {childrenTags.map((tag) => {
@@ -235,6 +304,7 @@ export const TagsListItem: FunctionComponent<Props> = observer(
tag={tag} tag={tag}
tagsState={tagsState} tagsState={tagsState}
features={features} features={features}
onContextMenu={onContextMenu}
/> />
); );
})} })}

15
app/assets/javascripts/services/themeManager.ts
View File

@@ -84,7 +84,7 @@ export class ThemeManager extends ApplicationService {
break; break;
} }
case ApplicationEvent.FeaturesUpdated: { case ApplicationEvent.FeaturesUpdated: {
this.reloadThemeStatus(); this.handleFeaturesUpdated();
break; break;
} }
case ApplicationEvent.Launched: { case ApplicationEvent.Launched: {
@@ -119,7 +119,7 @@ export class ThemeManager extends ApplicationService {
super.deinit(); super.deinit();
} }
private reloadThemeStatus(): void { private handleFeaturesUpdated(): void {
let hasChange = false; let hasChange = false;
for (const themeUuid of this.activeThemes) { for (const themeUuid of this.activeThemes) {
const theme = this.application.findItem(themeUuid) as SNTheme; const theme = this.application.findItem(themeUuid) as SNTheme;
@@ -139,6 +139,17 @@ export class ThemeManager extends ApplicationService {
} }
} }
const activeThemes = (
this.application.getItems(ContentType.Theme) as SNTheme[]
).filter((theme) => theme.active);
for (const theme of activeThemes) {
if (!this.activeThemes.includes(theme.uuid)) {
this.activateTheme(theme);
hasChange = true;
}
}
if (hasChange) { if (hasChange) {
this.cacheThemeState(); this.cacheThemeState();
} }

2
app/assets/javascripts/strings.ts
View File

@@ -20,7 +20,7 @@ export const STRING_NEW_UPDATE_READY =
/** @tags */ /** @tags */
export const STRING_DELETE_TAG = export const STRING_DELETE_TAG =
'Are you sure you want to delete this tag? Note: deleting a tag will not delete its notes.'; 'Are you sure you want to delete this tag? Deleting a tag will not delete its subtags or its notes.';
export const STRING_MISSING_SYSTEM_TAG = 'We are missing a System Tag.'; export const STRING_MISSING_SYSTEM_TAG = 'We are missing a System Tag.';

150
app/assets/javascripts/ui_models/app_state/tags_state.ts
View File

@@ -1,5 +1,9 @@
import { confirmDialog } from '@/services/alertService'; import { confirmDialog } from '@/services/alertService';
import { STRING_DELETE_TAG } from '@/strings'; import { STRING_DELETE_TAG } from '@/strings';
import {
MAX_MENU_SIZE_MULTIPLIER,
MENU_MARGIN_FROM_APP_BORDER,
} from '@/constants';
import { import {
ComponentAction, ComponentAction,
ContentType, ContentType,
@@ -72,6 +76,15 @@ export class TagsState {
selected_: AnyTag | undefined; selected_: AnyTag | undefined;
previouslySelected_: AnyTag | undefined; previouslySelected_: AnyTag | undefined;
editing_: SNTag | undefined; editing_: SNTag | undefined;
addingSubtagTo: SNTag | undefined;
contextMenuOpen = false;
contextMenuPosition: { top?: number; left: number; bottom?: number } = {
top: 0,
left: 0,
};
contextMenuClickLocation: { x: number; y: number } = { x: 0, y: 0 };
contextMenuMaxHeight: number | 'auto' = 'auto';
private readonly tagsCountsState: TagsCountsState; private readonly tagsCountsState: TagsCountsState;
@@ -85,6 +98,7 @@ export class TagsState {
this.selected_ = undefined; this.selected_ = undefined;
this.previouslySelected_ = undefined; this.previouslySelected_ = undefined;
this.editing_ = undefined; this.editing_ = undefined;
this.addingSubtagTo = undefined;
this.smartTags = this.application.getSmartTags(); this.smartTags = this.application.getSmartTags();
this.selected_ = this.smartTags[0]; this.selected_ = this.smartTags[0];
@@ -105,6 +119,9 @@ export class TagsState {
selectedUuid: computed, selectedUuid: computed,
editingTag: computed, editingTag: computed,
addingSubtagTo: observable,
setAddingSubtagTo: action,
assignParent: action, assignParent: action,
rootTags: computed, rootTags: computed,
@@ -114,6 +131,15 @@ export class TagsState {
undoCreateNewTag: action, undoCreateNewTag: action,
save: action, save: action,
remove: action, remove: action,
contextMenuOpen: observable,
contextMenuPosition: observable,
contextMenuMaxHeight: observable,
contextMenuClickLocation: observable,
setContextMenuOpen: action,
setContextMenuClickLocation: action,
setContextMenuPosition: action,
setContextMenuMaxHeight: action,
}); });
appEventListeners.push( appEventListeners.push(
@@ -159,6 +185,114 @@ export class TagsState {
); );
} }
async createSubtagAndAssignParent(parent: SNTag, title: string) {
const hasEmptyTitle = title.length === 0;
if (hasEmptyTitle) {
this.setAddingSubtagTo(undefined);
return;
}
const createdTag = await this.application.createTagOrSmartTag(title);
const futureSiblings = this.application.getTagChildren(parent);
if (!isValidFutureSiblings(this.application, futureSiblings, createdTag)) {
this.setAddingSubtagTo(undefined);
this.remove(createdTag, false);
return;
}
this.assignParent(createdTag.uuid, parent.uuid);
this.application.sync();
runInAction(() => {
this.selected = createdTag as SNTag;
});
this.setAddingSubtagTo(undefined);
}
setAddingSubtagTo(tag: SNTag | undefined): void {
this.addingSubtagTo = tag;
}
setContextMenuOpen(open: boolean): void {
this.contextMenuOpen = open;
}
setContextMenuClickLocation(location: { x: number; y: number }): void {
this.contextMenuClickLocation = location;
}
setContextMenuPosition(position: {
top?: number;
left: number;
bottom?: number;
}): void {
this.contextMenuPosition = position;
}
setContextMenuMaxHeight(maxHeight: number | 'auto'): void {
this.contextMenuMaxHeight = maxHeight;
}
reloadContextMenuLayout(): void {
const { clientHeight } = document.documentElement;
const defaultFontSize = window.getComputedStyle(
document.documentElement
).fontSize;
const maxContextMenuHeight =
parseFloat(defaultFontSize) * MAX_MENU_SIZE_MULTIPLIER;
const footerElementRect = document
.getElementById('footer-bar')
?.getBoundingClientRect();
const footerHeightInPx = footerElementRect?.height;
// Open up-bottom is default behavior
let openUpBottom = true;
if (footerHeightInPx) {
const bottomSpace =
clientHeight - footerHeightInPx - this.contextMenuClickLocation.y;
const upSpace = this.contextMenuClickLocation.y;
// If not enough space to open up-bottom
if (maxContextMenuHeight > bottomSpace) {
// If there's enough space, open bottom-up
if (upSpace > maxContextMenuHeight) {
openUpBottom = false;
this.setContextMenuMaxHeight('auto');
// Else, reduce max height (menu will be scrollable) and open in whichever direction there's more space
} else {
if (upSpace > bottomSpace) {
this.setContextMenuMaxHeight(upSpace - MENU_MARGIN_FROM_APP_BORDER);
openUpBottom = false;
} else {
this.setContextMenuMaxHeight(
bottomSpace - MENU_MARGIN_FROM_APP_BORDER
);
}
}
} else {
this.setContextMenuMaxHeight('auto');
}
}
if (openUpBottom) {
this.setContextMenuPosition({
top: this.contextMenuClickLocation.y,
left: this.contextMenuClickLocation.x,
});
} else {
this.setContextMenuPosition({
bottom: clientHeight - this.contextMenuClickLocation.y,
left: this.contextMenuClickLocation.x,
});
}
}
public get allLocalRootTags(): SNTag[] { public get allLocalRootTags(): SNTag[] {
if (this.editing_ && this.application.isTemplateItem(this.editing_)) { if (this.editing_ && this.application.isTemplateItem(this.editing_)) {
return [this.editing_, ...this.rootTags]; return [this.editing_, ...this.rootTags];
@@ -270,9 +404,9 @@ export class TagsState {
this.selected_ = tag; this.selected_ = tag;
} }
public setExpanded(tag: SNTag, exapnded: boolean) { public setExpanded(tag: SNTag, expanded: boolean) {
this.application.changeAndSaveItem<TagMutator>(tag.uuid, (mutator) => { this.application.changeAndSaveItem<TagMutator>(tag.uuid, (mutator) => {
mutator.expanded = exapnded; mutator.expanded = expanded;
}); });
} }
@@ -312,13 +446,15 @@ export class TagsState {
this.selected = previousTag; this.selected = previousTag;
} }
public async remove(tag: SNTag) { public async remove(tag: SNTag, userTriggered: boolean) {
if ( let shouldDelete = !userTriggered;
await confirmDialog({ if (userTriggered) {
shouldDelete = await confirmDialog({
text: STRING_DELETE_TAG, text: STRING_DELETE_TAG,
confirmButtonStyle: 'danger', confirmButtonStyle: 'danger',
}) });
) { }
if (shouldDelete) {
this.application.deleteItem(tag); this.application.deleteItem(tag);
this.selected = this.smartTags[0]; this.selected = this.smartTags[0];
} }

4
app/assets/javascripts/web_device_interface.ts
View File

@@ -1,13 +1,13 @@
import { import {
DeviceInterface,
getGlobalScope, getGlobalScope,
SNApplication, SNApplication,
ApplicationIdentifier, ApplicationIdentifier,
AbstractDevice,
} from '@standardnotes/snjs'; } from '@standardnotes/snjs';
import { Database } from '@/database'; import { Database } from '@/database';
import { Bridge } from './services/bridge'; import { Bridge } from './services/bridge';
export class WebDeviceInterface extends DeviceInterface { export class WebDeviceInterface extends AbstractDevice {
private databases: Database[] = []; private databases: Database[] = [];
constructor(private bridge: Bridge) { constructor(private bridge: Bridge) {

11
app/assets/stylesheets/_editor.scss
View File

@@ -64,17 +64,22 @@ $heading-height: 75px;
} }
} }
#save-status { #save-status-container {
position: relative;
min-width: 15ch;
max-width: 15ch;
overflow: visible;
margin-right: 20px; margin-right: 20px;
}
#save-status {
font-size: calc(var(--sn-stylekit-base-font-size) - 2px); font-size: calc(var(--sn-stylekit-base-font-size) - 2px);
text-transform: none; text-transform: none;
font-weight: normal; font-weight: normal;
text-align: right; text-align: right;
white-space: nowrap;
.desc, .desc,
.message:not(.warning):not(.danger) { .message:not(.warning):not(.danger) {
// color: var(--sn-stylekit-editor-foreground-color);
opacity: 0.35; opacity: 0.35;
} }
} }

25
app/assets/stylesheets/_navigation.scss
View File

@@ -61,6 +61,15 @@ $content-horizontal-padding: 16px;
} }
} }
.tag {
border: 0;
background-color: transparent;
&:focus {
background-color: var(--sn-stylekit-secondary-contrast-background-color);
}
}
.tag, .tag,
.root-drop { .root-drop {
font-size: 14px; font-size: 14px;
@@ -81,17 +90,17 @@ $content-horizontal-padding: 16px;
.sn-icon { .sn-icon {
display: block; display: block;
margin: 0 auto; margin: 0 auto;
&.hidden {
visibility: hidden;
}
} }
> .tag-fold { .tag-fold {
width: 22px; min-width: 22px;
display: flex; display: flex;
align-items: center; align-items: center;
height: 100%; height: 100%;
@extend .border-0;
@extend .bg-transparent;
@extend .p-0;
} }
> .tag-icon { > .tag-icon {
@@ -147,12 +156,12 @@ $content-horizontal-padding: 16px;
} }
} }
> .count { .count {
padding-right: 4px; padding-right: 4px;
padding-top: 1px; padding-top: 1px;
font-weight: bold; font-weight: bold;
color: var(--sn-stylekit-neutral-color); color: var(--sn-stylekit-neutral-color);
min-width: 35px; min-width: 15px;
text-align: right; text-align: right;
} }
} }

12
app/assets/stylesheets/_sn.scss
View File

@@ -954,3 +954,15 @@
.sn-component .border-contrast { .sn-component .border-contrast {
border-color: var(--sn-stylekit-contrast-border-color); border-color: var(--sn-stylekit-contrast-border-color);
} }
.resize-none {
resize: none;
}
.visible {
visibility: visible;
}
.invisible {
visibility: hidden;
}

18
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.11.1", "version": "3.11.2",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -31,8 +31,8 @@
"@types/jest": "^27.4.0", "@types/jest": "^27.4.0",
"@types/lodash": "^4.14.178", "@types/lodash": "^4.14.178",
"@types/react": "^17.0.39", "@types/react": "^17.0.39",
"@typescript-eslint/eslint-plugin": "^5.12.0", "@typescript-eslint/eslint-plugin": "^5.12.1",
"@typescript-eslint/parser": "^5.12.0", "@typescript-eslint/parser": "^5.12.1",
"apply-loader": "^2.0.0", "apply-loader": "^2.0.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"babel-loader": "^8.2.3", "babel-loader": "^8.2.3",
@@ -41,7 +41,7 @@
"css-loader": "^6.6.0", "css-loader": "^6.6.0",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"eslint": "^8.9.0", "eslint": "^8.9.0",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.4.0",
"eslint-plugin-react": "^7.28.0", "eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0", "eslint-plugin-react-hooks": "^4.3.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
@@ -57,7 +57,7 @@
"pretty-quick": "^3.1.3", "pretty-quick": "^3.1.3",
"sass-loader": "^12.6.0", "sass-loader": "^12.6.0",
"serve-static": "^1.14.2", "serve-static": "^1.14.2",
"@standardnotes/stylekit": "5.8.0", "@standardnotes/stylekit": "5.9.0",
"svg-jest": "^1.0.1", "svg-jest": "^1.0.1",
"ts-jest": "^27.1.3", "ts-jest": "^27.1.3",
"ts-loader": "^9.2.6", "ts-loader": "^9.2.6",
@@ -76,12 +76,12 @@
"@reach/dialog": "^0.16.2", "@reach/dialog": "^0.16.2",
"@reach/listbox": "^0.16.2", "@reach/listbox": "^0.16.2",
"@reach/tooltip": "^0.16.2", "@reach/tooltip": "^0.16.2",
"@standardnotes/components": "1.7.4", "@standardnotes/components": "1.7.5",
"@standardnotes/features": "1.32.8", "@standardnotes/features": "1.32.11",
"@standardnotes/snjs": "2.61.4", "@standardnotes/snjs": "2.63.1",
"@standardnotes/settings": "^1.11.3", "@standardnotes/settings": "^1.11.3",
"@standardnotes/sncrypto-web": "1.7.0", "@standardnotes/sncrypto-web": "1.7.0",
"mobx": "^6.4.0", "mobx": "^6.4.1",
"mobx-react-lite": "^3.3.0", "mobx-react-lite": "^3.3.0",
"preact": "^10.6.6", "preact": "^10.6.6",
"qrcode.react": "^1.0.1", "qrcode.react": "^1.0.1",

208
yarn.lock
View File

@@ -2366,39 +2366,47 @@
dependencies: dependencies:
"@sinonjs/commons" "^1.7.0" "@sinonjs/commons" "^1.7.0"
"@standardnotes/auth@^3.16.2": "@standardnotes/auth@^3.16.4":
version "3.16.2" version "3.16.4"
resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.16.2.tgz#ad7352a2578d4a581a3210cf77fc884089c1b5f5" resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.16.4.tgz#6293bd67cdc4055229f1d520b6f44b39c6053a7a"
integrity sha512-BSPdIZpON9lPo+uzTU1qyxWoLtsJ8DDFrlAiKWgXLud0mQwGDaFdZKJGJwgOc8AdPJbbLcaNiFDiSCRnpnoN9A== integrity sha512-2tHsDnwQgGD3pOzKuSjo4yj8hLjATb70jzFnEWoEpyCdHTuGys9qSBElfi672hU4vg+/nXaHpdVUuD5DPzLaXg==
dependencies: dependencies:
"@standardnotes/common" "^1.12.0" "@standardnotes/common" "^1.14.0"
jsonwebtoken "^8.5.1" jsonwebtoken "^8.5.1"
"@standardnotes/common@^1.12.0": "@standardnotes/common@^1.14.0":
version "1.12.0" version "1.14.0"
resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.12.0.tgz#971e542ea260fd794a20bac8451b56caca11cd87" resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.14.0.tgz#c3b8e06fb8120524da8d135f2dc594998e5a5c3a"
integrity sha512-GqwRdZz2s078Gd8Xyb4/Kup0uJB1BEBGFHjPn8ERoUOos0hSuu40ybxtUWguItM4D4SP7QCXhMIfRtDyM0g7TQ== integrity sha512-QA8JhWty7y/N62jdLyWuXzsVvDDeFwcQAH/DB/g5Mmaqlz9VlKcsbRmVl4wHLG3ur6n5Qj68aOhzCQd0p7f/WA==
"@standardnotes/components@1.7.4": "@standardnotes/components@1.7.5":
version "1.7.4" version "1.7.5"
resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.7.4.tgz#77b17a424d411288a12366c65b6931729b2d73de" resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.7.5.tgz#2f199350779a8f99e9e536223d318b822bdf369f"
integrity sha512-yExiJw1lyClRpQlML0/FbCvULJe8c4mPp0WvXq1IRE5R3x3MZ6LsCJgoqZAylIXki8Zvw17mxvwA4ywbd/ug0A== integrity sha512-7nyrrcgPAkCf6pjbAIO8qOM+22KQU0jMCIDX3b4GAS1jXM7DJDy5Frnk3oMHd9NeFhnbf0TQH4Nz4uEeid6/HA==
"@standardnotes/domain-events@^2.23.11": "@standardnotes/domain-events@^2.23.14":
version "2.23.11" version "2.23.14"
resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.23.11.tgz#5cee6039e48983e49fcb04cb94b0f802e7745eeb" resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.23.14.tgz#733e340c6d42935c90858380d7721150d1804574"
integrity sha512-LTZovUtwpY2r5zVVbeQMLEnETqv1VuRIzsh6Gj+uEhBsJDlzorPPy40P3K/y5xSR4Ml8MQGqy1fBIjxpBBUKyQ== integrity sha512-DRPD0lGdVn/tbVyl97QGyyAcdUZd4qsETICCO882mG33HBN8Yc7st176U+izu3T5W3dlnTqE+MJUASj3UxVCvw==
dependencies: dependencies:
"@standardnotes/auth" "^3.16.2" "@standardnotes/auth" "^3.16.4"
"@standardnotes/features" "^1.32.8" "@standardnotes/features" "^1.32.11"
"@standardnotes/features@1.32.8", "@standardnotes/features@^1.32.8": "@standardnotes/features@1.32.11", "@standardnotes/features@^1.32.11":
version "1.32.8" version "1.32.11"
resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.32.8.tgz#0bf36a66f0633d2e90d9f77ec8fa384eaae99ab8" resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.32.11.tgz#43417e541bdf0ce8a10dfd68e8073fc1338f1888"
integrity sha512-nE6PMIzntGvqBUrxZJ+GIfND5Lw924NWTHbG4lNJb576OeW5SauOJV68n3nOYs0/edttsb9MldIaHMiP9pT4Vw== integrity sha512-ZheQibMz4t2A6LKWcTDDGc5760AnPLFnHFwsSp0O8YydI3yz+qjm3pFF8XNeAEwgSvOX1W1nlX3E/X5tCp5LgQ==
dependencies: dependencies:
"@standardnotes/auth" "^3.16.2" "@standardnotes/auth" "^3.16.4"
"@standardnotes/common" "^1.12.0" "@standardnotes/common" "^1.14.0"
"@standardnotes/services@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.1.0.tgz#42f743f58fb4ab85627368ae6bcdf513079ef708"
integrity sha512-r4lqUO30iHmjWodUTv+2D8xeCgpYFvJrNzR/pBIlZsAKMSjskxPyIUvBdQvHWs0o4vjf7ZedhpEwi68XwUqO3w==
dependencies:
"@standardnotes/common" "^1.14.0"
"@standardnotes/utils" "^1.1.1"
"@standardnotes/settings@^1.11.3": "@standardnotes/settings@^1.11.3":
version "1.11.3" version "1.11.3"
@@ -2419,28 +2427,39 @@
buffer "^6.0.3" buffer "^6.0.3"
libsodium-wrappers "^0.7.9" libsodium-wrappers "^0.7.9"
"@standardnotes/snjs@2.61.4": "@standardnotes/snjs@2.63.1":
version "2.61.4" version "2.63.1"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.61.4.tgz#311fb0988ade6b67ca77d3515d591a58894057a8" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.63.1.tgz#0759be39e77304fcca11ea902aa9be7bb737e756"
integrity sha512-3wgi53JrgN2HliszdHVvMGs7qJhehh/iVZOt12RxL+Gp5MN60H4sqW0uPH/FCHcJGr1zD8GXKF+hOWxFa6gQ/A== integrity sha512-d32CE7/yS+qEGlOfHTDc0NPzCFXPaK2zxlCi/j68R9lT/3LuV/uc1o9eNK9a5Fgcbtbk55vbW0rUYjQQVwUF8A==
dependencies: dependencies:
"@standardnotes/auth" "^3.16.2" "@standardnotes/auth" "^3.16.4"
"@standardnotes/common" "^1.12.0" "@standardnotes/common" "^1.14.0"
"@standardnotes/domain-events" "^2.23.11" "@standardnotes/domain-events" "^2.23.14"
"@standardnotes/features" "^1.32.8" "@standardnotes/features" "^1.32.11"
"@standardnotes/services" "^1.1.0"
"@standardnotes/settings" "^1.11.3" "@standardnotes/settings" "^1.11.3"
"@standardnotes/sncrypto-common" "^1.7.0" "@standardnotes/sncrypto-common" "^1.7.0"
"@standardnotes/utils" "^1.1.1"
"@standardnotes/stylekit@5.8.0": "@standardnotes/stylekit@5.9.0":
version "5.8.0" version "5.9.0"
resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.8.0.tgz#d76a65bcd5e25ff09c99b871705492f6b5e627c3" resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.9.0.tgz#16d62623335091062238c850a930dedaa5ad6f1d"
integrity sha512-txuEjuh2wx2FDt0xh9EZTr08svs36kAMn5chxOok3KZXYBCbWHRiapvUh1vWtiGAT27568tBqmrVejabPwLgvg== integrity sha512-lIlEKwxKkQT+AttSmN40zvzWzfqpfI4VPTscZvRnWRqMQjYDEnSbcA1h0UDcT5tvnrna4RtsOiUL9o0KDx56sg==
dependencies: dependencies:
"@reach/listbox" "^0.15.0" "@reach/listbox" "^0.15.0"
"@reach/menu-button" "^0.15.1" "@reach/menu-button" "^0.15.1"
"@svgr/webpack" "^6.2.1" "@svgr/webpack" "^6.2.1"
prop-types "^15.7.2" prop-types "^15.7.2"
"@standardnotes/utils@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.1.1.tgz#a936edd328b4e10b43b11ffc8b1626a499fa6659"
integrity sha512-LaB1Y4arvwuABT0fybJ9At6pPEAwsDooaldYPuvqyfQAWdeqRCBMHxRDCX6yunrrwBwk7UoTie9MRw6DF1igwg==
dependencies:
"@standardnotes/common" "^1.14.0"
dompurify "^2.3.4"
lodash "^4.17.19"
"@svgr/babel-plugin-add-jsx-attribute@^6.0.0": "@svgr/babel-plugin-add-jsx-attribute@^6.0.0":
version "6.0.0" version "6.0.0"
resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18" resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18"
@@ -2839,14 +2858,14 @@
dependencies: dependencies:
"@types/yargs-parser" "*" "@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^5.12.0": "@typescript-eslint/eslint-plugin@^5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz#bb46dd7ce7015c0928b98af1e602118e97df6c70" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz#b2cd3e288f250ce8332d5035a2ff65aba3374ac4"
integrity sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ== integrity sha512-M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw==
dependencies: dependencies:
"@typescript-eslint/scope-manager" "5.12.0" "@typescript-eslint/scope-manager" "5.12.1"
"@typescript-eslint/type-utils" "5.12.0" "@typescript-eslint/type-utils" "5.12.1"
"@typescript-eslint/utils" "5.12.0" "@typescript-eslint/utils" "5.12.1"
debug "^4.3.2" debug "^4.3.2"
functional-red-black-tree "^1.0.1" functional-red-black-tree "^1.0.1"
ignore "^5.1.8" ignore "^5.1.8"
@@ -2854,69 +2873,69 @@
semver "^7.3.5" semver "^7.3.5"
tsutils "^3.21.0" tsutils "^3.21.0"
"@typescript-eslint/parser@^5.12.0": "@typescript-eslint/parser@^5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.12.0.tgz#0ca669861813df99ce54916f66f524c625ed2434" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.12.1.tgz#b090289b553b8aa0899740d799d0f96e6f49771b"
integrity sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog== integrity sha512-6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw==
dependencies: dependencies:
"@typescript-eslint/scope-manager" "5.12.0" "@typescript-eslint/scope-manager" "5.12.1"
"@typescript-eslint/types" "5.12.0" "@typescript-eslint/types" "5.12.1"
"@typescript-eslint/typescript-estree" "5.12.0" "@typescript-eslint/typescript-estree" "5.12.1"
debug "^4.3.2" debug "^4.3.2"
"@typescript-eslint/scope-manager@5.12.0": "@typescript-eslint/scope-manager@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz#59619e6e5e2b1ce6cb3948b56014d3a24da83f5e" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz#58734fd45d2d1dec49641aacc075fba5f0968817"
integrity sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ== integrity sha512-J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ==
dependencies: dependencies:
"@typescript-eslint/types" "5.12.0" "@typescript-eslint/types" "5.12.1"
"@typescript-eslint/visitor-keys" "5.12.0" "@typescript-eslint/visitor-keys" "5.12.1"
"@typescript-eslint/type-utils@5.12.0": "@typescript-eslint/type-utils@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz#aaf45765de71c6d9707c66ccff76ec2b9aa31bb6" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz#8d58c6a0bb176b5e9a91581cda1a7f91a114d3f0"
integrity sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q== integrity sha512-Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg==
dependencies: dependencies:
"@typescript-eslint/utils" "5.12.0" "@typescript-eslint/utils" "5.12.1"
debug "^4.3.2" debug "^4.3.2"
tsutils "^3.21.0" tsutils "^3.21.0"
"@typescript-eslint/types@5.12.0": "@typescript-eslint/types@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.0.tgz#5b4030a28222ee01e851836562c07769eecda0b8" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.1.tgz#46a36a28ff4d946821b58fe5a73c81dc2e12aa89"
integrity sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ== integrity sha512-hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA==
"@typescript-eslint/typescript-estree@5.12.0": "@typescript-eslint/typescript-estree@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz#cabf545fd592722f0e2b4104711e63bf89525cd2" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz#6a9425b9c305bcbc38e2d1d9a24c08e15e02b722"
integrity sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ== integrity sha512-ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw==
dependencies: dependencies:
"@typescript-eslint/types" "5.12.0" "@typescript-eslint/types" "5.12.1"
"@typescript-eslint/visitor-keys" "5.12.0" "@typescript-eslint/visitor-keys" "5.12.1"
debug "^4.3.2" debug "^4.3.2"
globby "^11.0.4" globby "^11.0.4"
is-glob "^4.0.3" is-glob "^4.0.3"
semver "^7.3.5" semver "^7.3.5"
tsutils "^3.21.0" tsutils "^3.21.0"
"@typescript-eslint/utils@5.12.0": "@typescript-eslint/utils@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.12.0.tgz#92fd3193191621ab863add2f553a7b38b65646af" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.12.1.tgz#447c24a05d9c33f9c6c64cb48f251f2371eef920"
integrity sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw== integrity sha512-Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ==
dependencies: dependencies:
"@types/json-schema" "^7.0.9" "@types/json-schema" "^7.0.9"
"@typescript-eslint/scope-manager" "5.12.0" "@typescript-eslint/scope-manager" "5.12.1"
"@typescript-eslint/types" "5.12.0" "@typescript-eslint/types" "5.12.1"
"@typescript-eslint/typescript-estree" "5.12.0" "@typescript-eslint/typescript-estree" "5.12.1"
eslint-scope "^5.1.1" eslint-scope "^5.1.1"
eslint-utils "^3.0.0" eslint-utils "^3.0.0"
"@typescript-eslint/visitor-keys@5.12.0": "@typescript-eslint/visitor-keys@5.12.1":
version "5.12.0" version "5.12.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz#1ac9352ed140b07ba144ebf371b743fdf537ec16" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz#f722da106c8f9695ae5640574225e45af3e52ec3"
integrity sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg== integrity sha512-l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A==
dependencies: dependencies:
"@typescript-eslint/types" "5.12.0" "@typescript-eslint/types" "5.12.1"
eslint-visitor-keys "^3.0.0" eslint-visitor-keys "^3.0.0"
"@webassemblyjs/ast@1.11.1": "@webassemblyjs/ast@1.11.1":
@@ -4476,6 +4495,11 @@ domhandler@^4.0.0, domhandler@^4.2.0:
dependencies: dependencies:
domelementtype "^2.2.0" domelementtype "^2.2.0"
dompurify@^2.3.4:
version "2.3.6"
resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
domutils@^2.5.2, domutils@^2.6.0: domutils@^2.5.2, domutils@^2.6.0:
version "2.8.0" version "2.8.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -4736,10 +4760,10 @@ escodegen@^2.0.0:
optionalDependencies: optionalDependencies:
source-map "~0.6.1" source-map "~0.6.1"
eslint-config-prettier@^8.3.0: eslint-config-prettier@^8.4.0:
version "8.3.0" version "8.4.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz#8e6d17c7436649e98c4c2189868562921ef563de"
integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== integrity sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==
eslint-plugin-react-hooks@^4.3.0: eslint-plugin-react-hooks@^4.3.0:
version "4.3.0" version "4.3.0"
@@ -7283,10 +7307,10 @@ mobx-react-lite@^3.3.0:
resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.3.0.tgz#7174e807201943beff6f9d3701492314c9fc0db3" resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.3.0.tgz#7174e807201943beff6f9d3701492314c9fc0db3"
integrity sha512-U/kMSFtV/bNVgY01FuiGWpRkaQVHozBq5CEBZltFvPt4FcV111hEWkgwqVg9GPPZSEuEdV438PEz8mk8mKpYlA== integrity sha512-U/kMSFtV/bNVgY01FuiGWpRkaQVHozBq5CEBZltFvPt4FcV111hEWkgwqVg9GPPZSEuEdV438PEz8mk8mKpYlA==
mobx@^6.4.0: mobx@^6.4.1:
version "6.4.0" version "6.4.1"
resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.4.0.tgz#71beda560230527f75ad150638f061af9d9f5312" resolved "https://registry.yarnpkg.com/mobx/-/mobx-6.4.1.tgz#c1d0eeb37ceb31bb2020a85f6bf856782d47fe60"
integrity sha512-HluTl14lJjL1xeUfXekDstHT/RqdxtmgIQ+75eMXsy9zAwt5vOWMdrbYD/sLS3CAKTo7ctIZi6cI2aX47Fk05g== integrity sha512-NFXx0uMbGBgsa0uxhH099L8cMuoRQWh01q6Sf0ZX/3hFU7svJ7yfTD+1LnLMa5wzY/b7gImAeMsR1p0wordDnA==
mri@^1.1.5: mri@^1.1.5:
version "1.2.0" version "1.2.0"