From 101e7e0c28a79bbf39d75917495238620c118509 Mon Sep 17 00:00:00 2001 From: Domagoj Kriskovic Date: Fri, 3 Nov 2023 12:30:24 +0100 Subject: [PATCH] [cm6] advanced reference search tooltip (#14953) --------- Co-authored-by: Alf Eaton GitOrigin-RevId: 8260353d551e68f743faa17de4d7fcfbfd80b22a --- package-lock.json | 20 +++++++++---------- .../web/frontend/extracted-translations.json | 3 ++- .../web/frontend/stylesheets/app/editor.less | 7 +------ services/web/locales/en.json | 3 ++- services/web/package.json | 2 +- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d8d885cdd..d3a1f72dd6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3200,15 +3200,15 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "node_modules/@codemirror/autocomplete": { - "version": "6.8.0", - "resolved": "git+ssh://git@github.com/overleaf/codemirror-autocomplete.git#b795675768e25c442916c7190da75716c0a5ac80", - "integrity": "sha512-iSrN8RaW6PTjtE6fBRga9DAB6qWAaPjAPC0S3jS4Ap+O13x5hcPLylZidZ5+mxFGLRag6TjmUKj22H+TWYfqwA==", + "version": "6.10.2", + "resolved": "git+ssh://git@github.com/overleaf/codemirror-autocomplete.git#dd201694c0ce7efa1777ef21d0dbe862dcefd338", + "integrity": "sha512-QauPciJyxC1xT8vMZFs/OhaaV7Nqq1Nfj3YLFQbyTkxhsyK69vz2wdiZ+63sWcBT3crZf53NPPhiK2ZxyQaMxQ==", "dev": true, "license": "MIT", "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.6.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" }, "peerDependencies": { @@ -39619,7 +39619,7 @@ "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.2", "@babel/register": "^7.22.15", - "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#b795675768e25c442916c7190da75716c0a5ac80", + "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.10.2-overleaf-1", "@codemirror/commands": "^6.3.0", "@codemirror/lang-markdown": "^6.2.1", "@codemirror/language": "^6.9.1", @@ -42932,14 +42932,14 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" }, "@codemirror/autocomplete": { - "version": "git+ssh://git@github.com/overleaf/codemirror-autocomplete.git#b795675768e25c442916c7190da75716c0a5ac80", - "integrity": "sha512-iSrN8RaW6PTjtE6fBRga9DAB6qWAaPjAPC0S3jS4Ap+O13x5hcPLylZidZ5+mxFGLRag6TjmUKj22H+TWYfqwA==", + "version": "git+ssh://git@github.com/overleaf/codemirror-autocomplete.git#dd201694c0ce7efa1777ef21d0dbe862dcefd338", + "integrity": "sha512-QauPciJyxC1xT8vMZFs/OhaaV7Nqq1Nfj3YLFQbyTkxhsyK69vz2wdiZ+63sWcBT3crZf53NPPhiK2ZxyQaMxQ==", "dev": true, - "from": "@codemirror/autocomplete@github:overleaf/codemirror-autocomplete#b795675768e25c442916c7190da75716c0a5ac80", + "from": "@codemirror/autocomplete@github:overleaf/codemirror-autocomplete#v6.10.2-overleaf-1", "requires": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", - "@codemirror/view": "^6.6.0", + "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, @@ -47756,7 +47756,7 @@ "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.2", "@babel/register": "^7.22.15", - "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#b795675768e25c442916c7190da75716c0a5ac80", + "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.10.2-overleaf-1", "@codemirror/commands": "^6.3.0", "@codemirror/lang-markdown": "^6.2.1", "@codemirror/language": "^6.9.1", diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 358e6a6118..240a31f4dc 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -779,6 +779,7 @@ "only_group_admin_or_managers_can_delete_your_account_5": "", "only_importer_can_refresh": "", "open_a_file_on_the_left": "", + "open_advanced_reference_search": "", "open_file": "", "open_link": "", "open_project": "", @@ -847,7 +848,6 @@ "postal_code": "", "premium_feature": "", "premium_plan_label": "", - "press_shortcut_to_open_advanced_reference_search": "", "price": "", "primarily_work_study_question": "", "primarily_work_study_question_government": "", @@ -1058,6 +1058,7 @@ "share_with_your_collabs": "", "shared_with_you": "", "sharelatex_beta_program": "", + "shortcut_to_open_advanced_reference_search": "", "show_all": "", "show_all_projects": "", "show_all_uppercase": "", diff --git a/services/web/frontend/stylesheets/app/editor.less b/services/web/frontend/stylesheets/app/editor.less index 8182f948e6..744df1e80a 100644 --- a/services/web/frontend/stylesheets/app/editor.less +++ b/services/web/frontend/stylesheets/app/editor.less @@ -573,8 +573,7 @@ CodeMirror } } -.bibtex-hint-banner, -.references-search-banner { +.bibtex-hint-banner { position: absolute; top: 8px; right: 8px; @@ -585,10 +584,6 @@ CodeMirror padding: 5px 10px; } -.references-search-banner { - align-items: center; -} - .bibtex-hint-banner { align-items: flex-start; diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 0010108847..9853ed8450 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1209,6 +1209,7 @@ "only_group_admin_or_managers_can_delete_your_account_5": "For more information, see the \"Managed Accounts\" section in our terms of use, which you agree to by clicking Accept invitation", "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.", "open_a_file_on_the_left": "Open a file on the left", + "open_advanced_reference_search": "Open advanced reference search", "open_as_template": "Open as Template", "open_file": "Edit file", "open_link": "Go to page", @@ -1323,7 +1324,6 @@ "premium_plan_label": "You’re using Overleaf Premium", "presentation": "Presentation", "press_and_awards": "Press & awards", - "press_shortcut_to_open_advanced_reference_search": "Press __ctrlSpace__ or __altSpace__ to open Advanced Reference Search", "price": "Price", "primarily_work_study_question": "Where do you primarily work or study?", "primarily_work_study_question_government": "In the government", @@ -1615,6 +1615,7 @@ "share_with_your_collabs": "Share with your collaborators", "shared_with_you": "Shared with you", "sharelatex_beta_program": "__appName__ Beta Program", + "shortcut_to_open_advanced_reference_search": "(__ctrlSpace__ or __altSpace__)", "show_all": "show all", "show_all_projects": "Show all projects", "show_all_uppercase": "Show all", diff --git a/services/web/package.json b/services/web/package.json index be42e993e5..f637c9ee91 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -172,7 +172,7 @@ "@babel/preset-react": "^7.22.15", "@babel/preset-typescript": "^7.23.2", "@babel/register": "^7.22.15", - "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#b795675768e25c442916c7190da75716c0a5ac80", + "@codemirror/autocomplete": "github:overleaf/codemirror-autocomplete#v6.10.2-overleaf-1", "@codemirror/commands": "^6.3.0", "@codemirror/lang-markdown": "^6.2.1", "@codemirror/language": "^6.9.1",