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

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Antonella Sgarlatta
2021-05-25 18:11:27 -03:00
parent d2ec5f6645 2e30fe831a
commit d738594a9c
7 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
...position, ...position,
maxHeight maxHeight
}} }}
className="sn-dropdown max-h-120 max-w-80 flex flex-col py-2 overflow-y-scroll fixed" className="sn-dropdown sn-dropdown--animated max-h-120 max-w-80 flex flex-col py-2 overflow-y-scroll fixed"
> >
{open && ( {open && (
<NotesOptions <NotesOptions

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

@@ -63,7 +63,7 @@ const SearchOptions = observer(({ appState }: Props) => {
style={{ style={{
top: optionsPanelTop, top: optionsPanelTop,
}} }}
className="sn-dropdown sn-dropdown-anchor-right absolute grid gap-2 py-2" className="sn-dropdown sn-dropdown--anchor-right sn-dropdown--animated absolute grid gap-2 py-2"
> >
<Switch <Switch
className="h-10" className="h-10"

3
app/assets/javascripts/directives/views/componentView.ts
View File

@@ -156,6 +156,9 @@ class ComponentViewCtrl implements ComponentViewScope {
case (ComponentAction.KeyUp): case (ComponentAction.KeyUp):
this.application.io.handleComponentKeyUp(data.keyboardModifier); this.application.io.handleComponentKeyUp(data.keyboardModifier);
break; break;
case (ComponentAction.Click):
this.application.getAppState().notes.setContextMenuOpen(false);
break;
default: default:
return; return;
} }

1
app/assets/javascripts/views/notes/notes_view.ts
View File

@@ -400,6 +400,7 @@ class NotesViewCtrl extends PureViewCtrl<unknown, NotesCtrlState> {
} }
async createNewNote() { async createNewNote() {
this.appState.notes.unselectNotes();
let title = `Note ${this.state.notes.length + 1}`; let title = `Note ${this.state.notes.length + 1}`;
if (this.isFiltering()) { if (this.isFiltering()) {
title = this.state.noteFilter.text; title = this.state.noteFilter.text;

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

@@ -208,21 +208,24 @@
.sn-dropdown { .sn-dropdown {
@extend .bg-default; @extend .bg-default;
@extend .min-w-80; @extend .min-w-80;
@extend .transition-transform;
@extend .duration-150;
@extend .slide-down-animation;
@extend .rounded; @extend .rounded;
@extend .box-shadow; @extend .box-shadow;
z-index: $z-index-dropdown-menu; z-index: $z-index-dropdown-menu;
&.sn-dropdown-anchor-right { &.sn-dropdown--anchor-right {
right: 0; right: 0;
} }
&[data-state='collapsed'] { &[data-state='collapsed'] {
display: none; display: none;
} }
&.sn-dropdown--animated {
@extend .transition-transform;
@extend .duration-150;
@extend .slide-down-animation;
}
} }
/** Lesser specificity will give priority to reach's styles */ /** Lesser specificity will give priority to reach's styles */

4
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "standard-notes-web", "name": "standard-notes-web",
"version": "3.7.0-beta01", "version": "3.7.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"repository": { "repository": {
"type": "git", "type": "git",
@@ -71,7 +71,7 @@
"@reach/checkbox": "^0.13.2", "@reach/checkbox": "^0.13.2",
"@reach/dialog": "^0.13.0", "@reach/dialog": "^0.13.0",
"@standardnotes/sncrypto-web": "1.2.10", "@standardnotes/sncrypto-web": "1.2.10",
"@standardnotes/snjs": "2.3.0", "@standardnotes/snjs": "2.3.1",
"mobx": "^6.1.6", "mobx": "^6.1.6",
"mobx-react-lite": "^3.2.0", "mobx-react-lite": "^3.2.0",
"preact": "^10.5.12" "preact": "^10.5.12"

8
yarn.lock
View File

@@ -1936,10 +1936,10 @@
"@standardnotes/sncrypto-common" "^1.2.7" "@standardnotes/sncrypto-common" "^1.2.7"
libsodium-wrappers "^0.7.8" libsodium-wrappers "^0.7.8"
"@standardnotes/snjs@2.3.0": "@standardnotes/snjs@2.3.1":
version "2.3.0" version "2.3.1"
resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.3.0.tgz#52f6b5458e348e77642f922dd4302ad8c6d28914" resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.3.1.tgz#48b68050ac4c4616bebab0128fd093cad0d65ea7"
integrity sha512-4xlLcVKJznhqCTKWy4IhYPbnxc3k66fzBeTdWJqZZ/n0vOT2l1/ybCRrPP0os/7NFCtK3CqInApbzZP6xXUhuA== integrity sha512-PTWt5R4OTrbyMKX8eTr/fc6Z0o4WrOJucDfMUWBQeIajHQg7V3MHpp0PArz+SS1Qdj3n7eVdl5qyHFjymL3C/w==
dependencies: dependencies:
"@standardnotes/auth" "^2.0.0" "@standardnotes/auth" "^2.0.0"
"@standardnotes/sncrypto-common" "^1.2.9" "@standardnotes/sncrypto-common" "^1.2.9"