Commit graph

172 commits

Author SHA1 Message Date
Mathias Jakobsen
31190b967b [cm6] Add figure modal (#12751)
GitOrigin-RevId: 3043d1369ed85b38b1fec7479385b123a304c05b
2023-05-16 08:04:02 +00:00
Alf Eaton
0ffa75979f Merge pull request #13001 from overleaf/td-history-version-hover-style
History migration: Use green selected style when hovering over selected version

GitOrigin-RevId: 7771ce64d719c3d0e5264dfd2fbbf52f5b519213
2023-05-10 08:05:45 +00:00
Tim Down
478b463e5f Merge pull request #12871 from overleaf/td-history-update-button-shadow
History migration: add shadow to "more updates" buttons

GitOrigin-RevId: e74cd8f8b7cf27393483b7c675f3ed607a5d6b06
2023-05-10 08:04:10 +00:00
M Fahru
c19fa74aa4 In history react file tree, always show badge (stick to the right side) and truncate long filename with ellipsis (#12897)
GitOrigin-RevId: 2e982f03b7a60e506f061a2c5bf1ab3d93dfccf5
2023-05-09 08:05:08 +00:00
Tim Down
76103eb77f Merge pull request #12874 from overleaf/td-history-binary-file
History migration: Show alert for binary file preview

GitOrigin-RevId: f30e4946ce9f873661055b8a096c6aba7ab08e2d
2023-05-02 19:45:22 +00:00
Tim Down
1fb921de99 History migration: Add error handling for all history requests (#12872)
* Add error handling for all history requests

* Remove comment

GitOrigin-RevId: 528dc98a0fc4ab523f8536274996c4166be45064
2023-05-02 19:44:48 +00:00
Tim Down
70bae34bd8 Add paywall to React history view (#12849)
* Implement history view paywall

* Add tests and some CSS fallbacks

* Make additional faded version above paywall non-clickable

* Change isFaded to faded for consistency

* Remove unused import

* Add missing attribute

* SHow all labels in free tier

* Address review comments

* Change Boolean conversion

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>

* Make adding or deleting a label show up in version list again

* Refactor to use visibleUpdateCount rather than maintaining two separate update arrays

* Removed unused import

* Use data-testid instead on class

* Round gradient values

* Correct test selector

---------

Co-authored-by: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com>
GitOrigin-RevId: a2b021f3f4d3b9eb1358edb2ee4aa7db1bc7240e
2023-05-02 19:44:39 +00:00
M Fahru
0648b8aa6c Implement deleted file restore for history react (#12753)
* Add strikethrough to deleted file tree item in history file tree

* Add "restore file" button on toolbar if the selected file have a `removed` operation.

* Implement "restore file" functionality on removed file:

- Refactor the `Selection` object in history context value since we need the `deletedAtV` data which currently is not passed through the state.
- Refactor and clean up file tree type system to support passing through the whole `FileDiff` object for getting the `deletedAtV` data which only appear on `removed` operation
- Implement `postJSON` with file restoration API and pass it on restore file onClick handler at toolbar

* Implement loading behaviour while restoring file is inflight:

- Add `loadingRestoreFile` to `LoadingState`
- Change restore file button to `Restoring...` when in loading state.

* Refactor:

- Rename `DiffOperation` to `FileOperation`
- Extract `isFileRemoved` and `isFileRenamed` to its own file
- Extract `Toolbar` components into small files

GitOrigin-RevId: 2e32ebd2165f73fc6533ff282a9c084162efd682
2023-04-28 08:04:59 +00:00
ilkin-overleaf
0895e33235 Merge pull request #12773 from overleaf/ii-history-react-changes-list-dropdown
[web] Actions dropdown history migration

GitOrigin-RevId: 6b7055501c5eb1529b1794db92bb9f5f3faa6648
2023-04-26 08:05:24 +00:00
Tim Down
afd1195902 Add infinite scrolling to history versions list (#12752)
* Add infinite scrolling to change list, add spinner while doing initial updates load, refactor updates state

* Update type in tests

* Update types

* Using LoadingSpinner component

* Remove redundant imports

GitOrigin-RevId: 98c7eae8edbc4d10d7107d825045edfc4159494f
2023-04-25 08:06:22 +00:00
M Fahru
4dec157e08 Implement history react toolbar UI (#12530)
There are two different UI in this PR: `comparing` and `viewing` mode.

- For `comparing`, the user would be shown two separate date. It uses the `UpdateRange` object and this PR adds a timestamp to both `fromV` and `toV` of the object type.
- For `viewing`, the user would only be shown one date since `viewing` mode means viewing a specific update version.

Some other notable changes:

- Move `diff` state to `diff-view.tsx`, which contains `main.tsx` (main editor history view) and `toolbar.tsx` as its children
- refactor `autoSelectFile` by passing `updateRange.toV` directly
- refactor `updateIsSelected` by passing an object that contains `fromV` and `toV` instead of passing `update

There's also a cypress test for both the `viewing` mode and `comparing` mode in this PR.

GitOrigin-RevId: ba54f073f3479c55a39eb6b2932ea7faff78dddc
2023-04-21 08:03:39 +00:00
M Fahru
08d2eea47a Decouple history-file-tree styling out of editor file tree:
- Extract/duplicate the style from editor file tree (only extract styling that's being used in history file tree)
- Change some of the class name to avoid duplicated class name from the editor file tree
- Revert change to editor file tree since it has been moved to history file tree

GitOrigin-RevId: 6c3b20080c9b428363024db622f60e3540d919e6
2023-04-21 08:03:36 +00:00
Ilkin Ismailov
dd5509b16f add sm size to badge
GitOrigin-RevId: 4e69d582ce770abcff10f3a6b34662f4873fc224
2023-04-21 08:03:33 +00:00
M Fahru
8212b686c6 Implement new style for history file tree badge
GitOrigin-RevId: 6221bc00e5aecf49fd3f2657128d1e9a2d4e648b
2023-04-21 08:03:30 +00:00
Tim Down
99e1ff0804 Merge pull request #12644 from overleaf/td-history-compare
Initial implementation of comparing history versions

GitOrigin-RevId: 890e270d6e41856a79689ab41ccfbde25c4703ba
2023-04-19 08:03:25 +00:00
Tim Down
38998afa8e Implement history diff viewer buttons (#12439)
GitOrigin-RevId: 0ed8eb8568783b4938188a86c4ee75c767e6d713
2023-04-17 08:05:41 +00:00
Alexandre Bourdin
481cd14cb1 Merge pull request #12557 from overleaf/ii-history-react-labels-only
[web] History labels only list

GitOrigin-RevId: 58b8e5a5af0754e32841223f9c478c25900df526
2023-04-13 08:04:12 +00:00
ilkin-overleaf
8e0aa685ce Merge pull request #12549 from overleaf/ii-history-react-list-of-all-versions
[web] All versions of history entries

GitOrigin-RevId: 7365ac4913c115b3b2872a3713d893463719c15e
2023-04-12 08:03:47 +00:00
M Fahru
17a98d756e Add badges UI to history react file tree (#12479)
GitOrigin-RevId: 52c45b72110e01bb193139654fa9385cb9b9e489
2023-04-05 08:03:05 +00:00
Tim Down
11f8905be4 Connect up document diff viewer to history state
GitOrigin-RevId: 610a254ea77c194969033d0791ecf1129e02c4bf
2023-03-31 08:03:47 +00:00
ilkin-overleaf
867b37b76f Merge pull request #12417 from overleaf/ii-history-react-toggle-switch
[web] Toggle switch history migration

GitOrigin-RevId: c0812d03d576bc66dd8878fa80d4ac18dd8576d0
2023-03-30 08:04:22 +00:00
Alf Eaton
4ccf67203b Fix editor switcher colour transition (#12328)
GitOrigin-RevId: fc8caa34b12b9ef35422766023cdebf4bd36ff75
2023-03-30 08:03:20 +00:00
Tim Down
397fbd47c2 Merge pull request #12363 from overleaf/td-history-main-area-shell
Add CSS for main history view shell

GitOrigin-RevId: 9c455007bf8b177d59ea97cd73b608d48aba3907
2023-03-30 08:02:54 +00:00
ilkin-overleaf
d1d47b2767 Merge pull request #12339 from overleaf/ii-react-history-editor-and-change-list-init
[web] History editor and change list initialisation

GitOrigin-RevId: bb7800301d28c296bd524212cd27ddcd8defd149
2023-03-23 09:06:24 +00:00
Davinder Singh
cc2d1a26e2 Merge pull request #11958 from overleaf/ds-td-documentation-btn-refactor
Styling and HTML structure of the documentation button

GitOrigin-RevId: e643edbe05579c037ca1ec27fab765974e74d2c5
2023-02-27 09:03:47 +00:00
M Fahru
b62cb86bf8 Create new SplitMenu component and implement it for the pdf compile button (detached & non-detached) (#11772)
* Create a new shared `SplitMenu` component.

* Refactor the pdf compile button & detached compile button:
    - Rename `detach-compile-button` to `detach-compile-button-wrapper`
    - Rename `pdf-compile-button-inner` to `detach-compile-button`
    - Move some of the logic from `detach-compile-button-wrapper` to `detach-compile-button`
    - Create a new `compile-button.less` to centralize all of the compile button (detached/non-detached) custom styles rule.
    - Extract the animated striped CSS definition to the dedicated CSS file, change the class from `btn-recompile-group-has-changes` to `btn-striped-animated`
    - Refactor other className(s) appropriately according to the new component name
    - Delete the unused `changes-to-autocompile` css rule since it has not been used anywhere

* Implement the new pdf compile button with the new `SplitMenu` component.

GitOrigin-RevId: d1d055bffd311923fc47b4681605ce8ba8e26f25
2023-02-22 09:04:42 +00:00
Alf Eaton
1807f18b7d Add a tooltip to the disabled Rich Text toggle (#11843)
GitOrigin-RevId: e7be96c68d87ab1f1ed40c8e9784160689ee8e96
2023-02-17 09:04:15 +00:00
Davinder Singh
de245c288a Merge pull request #11653 from overleaf/ds-documentation-btn-on-editor
Adding documentation button on the editor

GitOrigin-RevId: e03fd7b931eb0fe7273e6e9d0185c81c384df916
2023-02-15 09:04:37 +00:00
June Kelly
035b5cd456 Merge pull request #11263 from overleaf/ae-rich-text-available
Only enable the Rich Text option for supported file extensions

GitOrigin-RevId: ae67435b50701bb5be71bab94d8c3c4da4129d88
2023-02-09 09:05:05 +00:00
Alf Eaton
85fbded781 Improve the Rich Text toolbar (#11616)
GitOrigin-RevId: d1999be629ac048058ffd82004865728796a3feb
2023-02-07 09:04:39 +00:00
M Fahru
1d04aa0315 Editor file uploader design update (#11447)
* Redesign the styling of conflict state for file upload in the editor

* Change overwrite button style from primary (green) to danger (red)

* Change the idle state and dragging state styling to match the error state new design:

    *remove the double border; only keep the dashed border
    * on idle state, change border color

* Add hardcoded texts to translation file

* Add padding to prevent text is becoming too near to the border when multiple files appear in the conflict file list

* Apply custom file uploader style to smaller screen

GitOrigin-RevId: 266e60bb8575a02c02c1ed1d7fa04cdb101f3dd1
2023-02-02 09:03:33 +00:00
Alf Eaton
69fe1749ce [rich-text] Improve toolbar button styles (#11419)
GitOrigin-RevId: 81def8f65591fe9f8f914384db971238faa4483f
2023-01-25 09:05:26 +00:00
Mathias Jakobsen
f3dac1aa95 [cm6+rt] Move CM6 formatting toolbar to panel (#11395)
GitOrigin-RevId: 97036c57d63fb7590dda7c98df3347ee83f41ae5
2023-01-25 09:05:05 +00:00
Alf Eaton
cf8051dcad Advertise CM6 Rich Text in the CM5 track changes panel (#11361)
GitOrigin-RevId: 3d2e43263528c64292a01afb3d032e11a6cbbfb9
2023-01-24 09:04:13 +00:00
M Fahru
29fbc253fd Clean up link sharing upgrade prompt test and keep the default variant
GitOrigin-RevId: d34ed081bbc61dfc74a7117c0ba633db4b5a0bad
2023-01-20 14:13:51 +00:00
M Fahru
19e1d50e2e Fix editor overleaf logo on editor disappears if menu button is pressed in light theme
GitOrigin-RevId: a4f104cf988bfc267ba70cbe546e150bea773691
2023-01-13 09:05:07 +00:00
Davinder Singh
306b2b7727 Merge pull request #10844 from overleaf/ds-editor-btn-info-to-secondary
Replacing `btn-info` with `btn-secondary-info btn-secondary` in the editor

GitOrigin-RevId: 1e348b0b09bfd08508a3dbee7df882f41fdc16eb
2022-12-19 09:04:17 +00:00
Alf Eaton
9f1f62b9be Add rich-text mode to CM6 (#10775)
Co-Authored-By: Mathias Jakobsen <3295293+hrjakobsen@users.noreply.github.com>
GitOrigin-RevId: 00e015cb216bb8a52d083e71b34dbe91a7cd6cc5
2022-12-13 09:03:54 +00:00
Davinder Singh
60dc53e685 Merge pull request #10790 from overleaf/ds-history-toggle-bug-fix
Fixed the bug with 2/3 way segmented control.

GitOrigin-RevId: d2e340c097d60ef47b4cf2817a413cc574a871de
2022-12-08 09:03:57 +00:00
Davinder Singh
4adfca52bf Merge pull request #10682 from overleaf/ds-btn-default-to-secondary-in-editor-part-2
Replacing btn-default with btn-secondary in the editor Part-2

GitOrigin-RevId: 708aa29070bb3049afbc8ee1a282eaa1018594a8
2022-12-08 09:03:42 +00:00
Jessica Lawshe
be520e7bb0 Merge pull request #10744 from overleaf/revert-10726-ds-bug-fix-history-segmented-control
Revert "Bug fix- Fixed the 2 way segmented control on history panel."

GitOrigin-RevId: 58a2d9ebb1023f76ed87249722b749cc5062b2b9
2022-12-01 09:05:51 +00:00
Jessica Lawshe
8537a37020 Merge pull request #10726 from overleaf/ds-bug-fix-history-segmented-control
Bug fix- Fixed the 2 way segmented control on history panel.

GitOrigin-RevId: 6d514ed2f1fd9b8342e918089d3966c1a1a388ba
2022-12-01 09:05:36 +00:00
M Fahru
6dcc22642a Update "go to line" hotkey for cm6 and add new info text in hotkeys modal
* Update "go to line" hotkey for cm6 and add new info text in hotkeys modal

* Differentiate modal title between cm6 and ace hotkeys

* Update test to reflect change in hotkeys modal title

* Add test for hotkeys modal bottom text

* Update test on editor left menu hotkeys button to reflect change in hotkeys modal title

GitOrigin-RevId: 61bae16313ea7a37fa3b9441dbe5a93ab7823d01
2022-11-25 09:04:20 +00:00
Jessica Lawshe
854c39d3f5 Merge pull request #10526 from overleaf/jel-btn-recompile
[web] `btn-recompile` and `log-btn` for new CSS

GitOrigin-RevId: b92724267a87f5dce8ed0e60e926c1939f64c4f9
2022-11-18 09:05:44 +00:00
Davinder Singh
c6f8b17647 Merge pull request #10286 from overleaf/jel-ds-toggle
Fix toggle and  `Switch to PDF` aligment

GitOrigin-RevId: d3c77ff34829af875d2b8b9e3797e0e7db867631
2022-11-16 09:04:26 +00:00
Davinder Singh
966a151686 Merge pull request #10270 from overleaf/ds-toolbar-logo-background-color
Removed the background colour for branded logo in light theme

GitOrigin-RevId: 935fba12d306e55bb994ca1b7a376f11cb0bd5c1
2022-11-16 09:04:18 +00:00
M Fahru
5eff354971 Create settings menu react elements in editor left menu for editor left menu react migration
GitOrigin-RevId: e75581a43a8694398b20bee3dc5ec69b60db86ab
2022-11-15 09:07:01 +00:00
Tim Down
cd60d6719a Merge pull request #10067 from overleaf/ds-design-segmented-control
Changed the css for segmented toggle switch animation

GitOrigin-RevId: e3c0dc496be9fedea5d9463f57b9844991f0c0eb
2022-11-02 09:04:14 +00:00
Tim Down
cbc3aef728 Merge pull request #10109 from overleaf/ds-switch-component
Modifying the Switch

GitOrigin-RevId: 93b8483aa4aa164ea0be5fc2b4ccc5cfb17eae3c
2022-11-02 09:04:07 +00:00
M Fahru
b85ae6e58e Migrate actions menu in editor left menu to react (#10102)
* Migrate actions menu in editor left menu to react

* Move margin from inline style to css file

* remove focus selector to avoid "highlighting" the button after closing modal and regain focus

* Add disabled state on word count button when the compiling is loading or failed

* Use div instead of button for disabled word count button

* Add accessibility text props when LeftMenuButton is disabled

* Add actions menu test cases and storybook components

* use util assign function and wrap function prop in usecallback

GitOrigin-RevId: 81ab104be21fbcf5dfbc72c07d29eeb32976c61f
2022-10-28 08:05:14 +00:00