Merge remote-tracking branch 'upstream/develop' into account-menu-react

2021-06-11 15:57:59 +04:00
parent 71d04943ee df1257ac7e
commit 0916ba50be
10 changed files with 29 additions and 22 deletions
--- a/app/assets/javascripts/components/AutocompleteTagInput.tsx
+++ b/app/assets/javascripts/components/AutocompleteTagInput.tsx
@@ -47,7 +47,9 @@ export const AutocompleteTagInput = observer(({ appState }: Props) => {

  const onFormSubmit = async (event: Event) => {
    event.preventDefault();
-    await appState.noteTags.createAndAddNewTag();
+    if (autocompleteSearchQuery !== '') {
+      await appState.noteTags.createAndAddNewTag();
+    }
  };

  const onKeyDown = (event: KeyboardEvent) => {
@@ -115,8 +117,9 @@ export const AutocompleteTagInput = observer(({ appState }: Props) => {
            ref={dropdownRef}
            className={`${tags.length > 0 ? 'w-80' : 'w-70 mr-10'} sn-dropdown flex flex-col py-2 absolute`}
            style={{ maxHeight: dropdownMaxHeight, maxWidth: tagsContainerMaxWidth }}
+            onBlur={closeOnBlur}
          >
-            <div className="overflow-y-scroll">
+            <div className="overflow-y-auto">
              {autocompleteTagResults.map((tagResult) => (
                <AutocompleteTagResult
                  key={tagResult.uuid}
--- a/app/assets/javascripts/components/NotesContextMenu.tsx
+++ b/app/assets/javascripts/components/NotesContextMenu.tsx
@@ -23,7 +23,7 @@ const NotesContextMenu = observer(({ appState }: Props) => {
  return appState.notes.contextMenuOpen ? (
    <div
      ref={contextMenuRef}
-      className="sn-dropdown max-h-120 max-w-xs flex flex-col py-2 overflow-y-scroll fixed"
+      className="sn-dropdown min-w-80 max-h-120 max-w-xs flex flex-col py-2 overflow-y-auto fixed"
      style={{
        ...appState.notes.contextMenuPosition,
        maxHeight: appState.notes.contextMenuMaxHeight,
--- a/app/assets/javascripts/components/NotesOptions.tsx
+++ b/app/assets/javascripts/components/NotesOptions.tsx
@@ -159,7 +159,7 @@ export const NotesOptions = observer(
                maxHeight: tagsMenuMaxHeight,
                position: 'fixed',
              }}
-              className="sn-dropdown flex flex-col py-2 max-h-120 max-w-xs fixed overflow-y-scroll"
+              className="sn-dropdown min-w-80 flex flex-col py-2 max-h-120 max-w-xs fixed overflow-y-auto"
            >
              {appState.tags.tags.map((tag) => (
                <button
--- a/app/assets/javascripts/components/NotesOptionsPanel.tsx
+++ b/app/assets/javascripts/components/NotesOptionsPanel.tsx
@@ -71,7 +71,7 @@ export const NotesOptionsPanel = observer(({ appState }: Props) => {
          ...position,
          maxHeight,
        }}
-        className="sn-dropdown sn-dropdown--animated max-h-120 max-w-xs flex flex-col py-2 overflow-y-scroll fixed"
+        className="sn-dropdown sn-dropdown--animated min-w-80 max-h-120 max-w-xs flex flex-col py-2 overflow-y-auto fixed"
      >
        {open && (
          <NotesOptions
--- a/app/assets/javascripts/components/SearchOptions.tsx
+++ b/app/assets/javascripts/components/SearchOptions.tsx
@@ -63,7 +63,7 @@ const SearchOptions = observer(({ appState }: Props) => {
        style={{
          top: optionsPanelTop,
        }}
-        className="sn-dropdown sn-dropdown--anchor-right sn-dropdown--animated absolute grid gap-2 py-2"
+        className="sn-dropdown sn-dropdown--anchor-right sn-dropdown--animated min-w-80 absolute grid gap-2 py-2"
      >
        <Switch
          className="h-10"
--- a/app/assets/javascripts/components/SessionsModal.tsx
+++ b/app/assets/javascripts/components/SessionsModal.tsx
@@ -126,7 +126,7 @@ const SessionsModal: FunctionComponent<{

  return (
    <>
-      <Dialog onDismiss={close} className="sessions-modal h-screen py-8">
+      <Dialog onDismiss={close} className="sessions-modal h-90vh">
        <div className="sk-modal-content">
          <div class="sn-component">
            <div class="sk-panel">
@@ -145,7 +145,7 @@ const SessionsModal: FunctionComponent<{
                  </button>
                </div>
              </div>
-              <div class="sk-panel-content overflow-y-scroll">
+              <div class="sk-panel-content overflow-y-auto">
                {refreshing ? (
                  <>
                    <div class="sk-spinner small info"></div>
--- a/app/assets/javascripts/views/tags/tags_view.ts
+++ b/app/assets/javascripts/views/tags/tags_view.ts
@@ -267,6 +267,7 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {

  async clickedAddNewTag() {
    if (this.getState().editingTag) {
+      console.log('editing');
      return;
    }
    const newTag = await this.application.createTemplateItem(
@@ -289,10 +290,10 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {

  async saveTag($event: Event, tag: SNTag) {
    ($event.target! as HTMLInputElement).blur();
-    if (!this.titles[tag.uuid]?.length) {
-      return this.undoCreateTag(tag);
-    }
    if (this.getState().templateTag) {
+      if (!this.titles[tag.uuid]?.length) {
+        return this.undoCreateTag(tag);
+      }
      return this.saveNewTag();
    } else {
      return this.saveTagRename(tag);
@@ -314,6 +315,9 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
    if (newTitle.length === 0) {
      this.titles[tag.uuid] = this.editingOriginalName;
      this.editingOriginalName = undefined;
+      await this.setState({
+        editingTag: undefined
+      });
      return;
    }
    const existingTag = this.application.findTagByTitle(newTitle);
@@ -345,6 +349,7 @@ class TagsViewCtrl extends PureViewCtrl<unknown, TagState> {
      this.application.alertService!.alert(
        "A tag with this name already exists."
      );
+      this.undoCreateTag(newTag);
      return;
    }
    const insertedTag = await this.application.insertItem(newTag);
--- a/app/assets/stylesheets/_sn.scss
+++ b/app/assets/stylesheets/_sn.scss
@@ -259,8 +259,8 @@
  height: 4.5rem;
 }

-.h-screen {
-  height: 100vh;
+.h-90vh {
+  height: 90vh;
 }

 .max-h-120 {
@@ -275,8 +275,8 @@
  position: fixed;
 }

-.overflow-y-scroll {
-  overflow-y: scroll;
+.overflow-y-auto {
+  overflow-y: auto;
 }

 .overflow-auto {
@@ -360,7 +360,6 @@

 .sn-dropdown {
  @extend .bg-default;
-  // @extend .min-w-80;
  @extend .rounded;
  @extend .box-shadow;

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "standard-notes-web",
-  "version": "3.9.0-beta01",
+  "version": "3.8.1",
  "license": "AGPL-3.0-or-later",
  "repository": {
    "type": "git",
@@ -71,7 +71,7 @@
    "@reach/checkbox": "^0.13.2",
    "@reach/dialog": "^0.13.0",
    "@standardnotes/sncrypto-web": "1.2.10",
-    "@standardnotes/snjs": "2.6.0",
+    "@standardnotes/snjs": "2.6.2",
    "mobx": "^6.1.6",
    "mobx-react-lite": "^3.2.0",
    "preact": "^10.5.12"
--- a/yarn.lock
+++ b/yarn.lock
@@ -1936,10 +1936,10 @@
    "@standardnotes/sncrypto-common" "^1.2.7"
    libsodium-wrappers "^0.7.8"

-"@standardnotes/snjs@2.6.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.6.0.tgz#8ebdfcb0918c308198b38a63d7aa946387b83ac4"
-  integrity sha512-Gb/kAdMtjVlSiQH7pkDzFxKtIrrY43i2hSejO2c+zCviZspiDZPpXLpEhMJ295ow2tluhOf8zfBUda3LMC6oDw==
+"@standardnotes/snjs@2.6.2":
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.6.2.tgz#dbd835f8c0fcdf951f636b3a5b6d0b54c00de458"
+  integrity sha512-/6U9sEBtT2MouwbH0OBaQW4eqnvwwNnXUXq+zDfV8UKqJPoEnwLGumnb72cJ8d/67e0haoltc2C8wHicbZgFrQ==
  dependencies:
    "@standardnotes/auth" "^2.0.0"
    "@standardnotes/sncrypto-common" "^1.2.9"