Commit Graph

278 Commits

Author SHA1 Message Date
Ramón Souza
320d121254 change cursor when moving shapes 2023-02-10 15:30:24 -03:00
Ramón Souza
225874ad77 adjust whiteboard toolbar in dark mode 2023-02-10 10:37:29 -03:00
Ramón Souza
ee006508cc adjust whiteboard toolbar buttons 2023-02-10 10:05:34 -03:00
Ramón Souza
5a93e3649f restore missing whiteboard shortcuts 2023-02-06 10:37:34 -03:00
Ramón Souza
f610bd472c fix resizing and copying shapes if limit is reached 2023-02-03 09:11:07 -03:00
Ramón Souza
25800ee92b limits the number of annotations per slide 2023-02-02 16:47:16 -03:00
Ramón Souza
9ec11ccc31
Merge pull request #16601 from ramonlsouza/issue-16595
fix: Zoom + drag on whiteboard does not move full range
2023-02-01 14:10:56 -03:00
Ramón Souza
6a32e03b70 fix pan tool 2023-01-30 13:05:35 -03:00
germanocaumo
de0b71ab76 fix(whiteboard): update viewport variables after update
Tldraw fixed the width/height mismatch bug in the latest version: eef0472683
2023-01-30 15:05:30 +00:00
Anton Georgiev
fa7aa6b80f
Merge pull request #16582 from ramonlsouza/fix-group-removal
fix(whiteboard): improve invalid shape filter
2023-01-27 12:57:33 -05:00
Ramón Souza
ac00ea4422
Merge pull request #16584 from danielpetri1/issue-16544
fix(whiteboard): Prevent infinite zoom levels
2023-01-27 13:47:29 -03:00
Daniel Petri Rocha
6a11e295ba Prevent division by zero in zoom calculation 2023-01-27 16:49:32 +01:00
Ramón Souza
b022f00c3d
Merge pull request #16581 from Tainan404/fix-whiteboard-position
fix: Fix whiteboard positioning when switching slides with zoom
2023-01-27 11:33:39 -03:00
Ramón Souza
5f6430db2a
Update bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx 2023-01-27 11:33:16 -03:00
Ramón Souza
13f033aea2 fix remove orphan shapes 2023-01-27 10:29:59 -03:00
Tainan Felipe
b57b810585 Fix whiteboard positioning when switching slides with zoom 2023-01-27 10:05:08 -03:00
Anton Georgiev
013dab9a9b
Merge pull request #16569 from ramonlsouza/issue-16153
fix: Whiteboard component crash
2023-01-26 11:21:49 -05:00
Ramón Souza
775dfd05af
Merge pull request #16564 from ramonlsouza/issue-16389
fix(whiteboard): Incorrect pen position after column resize
2023-01-26 11:29:51 -03:00
Ramón Souza
500a70eaa9 add early return if pageState is unavailable 2023-01-26 10:11:31 -03:00
Ramón Souza
e9677a714b
Merge pull request #16539 from KDSBrowne/bbb-16530
fix: Update Tldraw Toolbar Placement
2023-01-26 08:37:58 -03:00
Ramón Souza
4124732b86 fix draw position after resize 2023-01-25 15:49:09 -03:00
Ramón Souza
41a2b65463
Merge pull request #16525 from antobinary/wb-fix-1
fix: check for shape before shape.isLocked
2023-01-24 15:53:31 -03:00
germanocaumo
44692f9b71 refactor(whiteboard): move shapelock to container + linting
Do the shape lock propery set in the container so the props change less times and avoid problems in the useMemo.
2023-01-24 18:32:49 +00:00
Ramón Souza
f0c4ed0178 fix removal of grouped shapes 2023-01-23 17:00:05 -03:00
KDSBrowne
985fe7cbe2 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-16530 2023-01-23 15:34:44 +00:00
KDSBrowne
503fadab22 fix whiteboard toolbar position starting at bottom 2023-01-23 15:30:59 +00:00
Ramón Souza
b6f43f0491 Merge remote-tracking branch 'upstream/v2.6.x-release' into pr-16423-jan20 2023-01-20 16:55:54 -03:00
Anton Georgiev
bd8ff6951a fix: check for shape before shape.isLocked 2023-01-20 19:18:58 +00:00
Ramón Souza
04761bc24c
Merge pull request #16477 from ramonlsouza/block-image-shapes
fix: Disable paste file in whiteboard
2023-01-20 14:27:55 -03:00
Ramón Souza
419e83ecd4
add video as an invalid shape type 2023-01-20 13:16:38 -03:00
Anton Georgiev
c59b237537
Merge pull request #16509 from germanocaumo/f-tldraw-es-fallback
fix(tldraw): fallback es-xx locales to es
2023-01-20 09:11:02 -05:00
Ramón Souza
dfb438922e
Merge pull request #16502 from JoVictorNunes/issue-16479
fix(whiteboard): complete draw session when clicking outside of viewport
2023-01-20 09:16:14 -03:00
Anton Georgiev
f3f26bf659 fix: check for slidePosition before using it 2023-01-19 20:56:20 +00:00
Joao Victor
247219fe9e fix(whiteboard): complete draw session when leaving the tab 2023-01-19 17:27:30 -03:00
germanocaumo
a859cb93dd fix(tldraw): fallback es-xx locales to es 2023-01-18 20:08:32 +00:00
Ramón Souza
371406d4ff
Merge pull request #16498 from KDSBrowne/bbb-wb-perf-imp
Remove useEffect Hook Without Dependency Array
2023-01-18 16:16:02 -03:00
Joao Victor
28e40b77d5 fix(whiteboard): complete draw session when clicking outside of viewport 2023-01-18 10:12:16 -03:00
Ramón Souza
b995f6a33d
Merge pull request #16475 from JoVictorNunes/issue-15964-1
feat(whiteboard): configurable text tool font family
2023-01-18 08:26:11 -03:00
KDSBrowne
56fad69924 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-wb-perf-imp 2023-01-18 00:23:19 +00:00
KDSBrowne
4712770f32 remove useEffect hook without dependency array 2023-01-18 00:22:50 +00:00
Ramón Souza
dd1c330c64 fix change slide with same content 2023-01-17 14:45:15 -03:00
Ramón Souza
0dea438881 prevent copy+paste of images in whiteboard 2023-01-16 11:35:39 -03:00
Joao Victor
44896106b9 feat(whiteboard): configurable text tool font family 2023-01-16 08:40:42 -03:00
germanocaumo
5c35aed44d fix(whiteboard): restore per character text shape updates 2023-01-14 20:37:43 +00:00
Ramón Souza
b8d5ce2bb8
Merge pull request #16451 from JoVictorNunes/issue-16130
fix(tldraw): show tool cursors
2023-01-13 15:59:59 -03:00
Joao Victor
97eed6eded Remove unused code 2023-01-13 15:58:21 -03:00
Ramón Souza
ae6d89c881 restore drag-to-select feature - whiteboard 2023-01-12 08:50:05 -03:00
Joao Victor
14d529ead9 fix(tldraw): show tool cursors 2023-01-11 16:32:03 -03:00
KDSBrowne
124076d560 remove all shapes first before group types 2023-01-09 19:40:47 +00:00
Joao Victor
2291477f3d feat(whiteboard): reset zoom when switching presentation 2022-12-16 16:00:02 -03:00
Ramón Souza
692ee112cc disable paste file in whiteboard 2022-12-13 13:11:56 -03:00
Joao Victor
18d38b16ad fix: presentation toolbar and presentation menu 2022-11-25 18:24:06 -03:00
Ramón Souza
0bae2a7a9e
Merge pull request #16055 from ramonlsouza/issue-16049
refactor: enforce max characters limit in chat input
2022-11-23 17:02:12 -03:00
Ramón Souza
31f20b08b5 add max characters limit to sticky notes 2022-11-23 14:03:20 -03:00
Joao Victor
08659c0f29 fix: just show presentation 3-dot menu and toolbar after Tldraw has been mounted 2022-11-23 12:05:57 -03:00
KDSBrowne
bca5cc9fbe fix toolbar not responding to wb width 2022-11-17 23:37:17 +00:00
KDSBrowne
85aadaa03c handle whiteboard crash when typing quickly 2022-11-16 15:01:12 +00:00
KDSBrowne
6ed2e47f1d preserve state of shape being edited during memo updates 2022-11-16 04:12:28 +00:00
Ramón Souza
892e34dcf4
Merge pull request #16000 from KDSBrowne/bbb-patch-sticky-notes
Restore Per Character Updates In Sticky Note
2022-11-15 10:18:39 -03:00
KDSBrowne
9839d50a72 restore per character updates in sticky notes 2022-11-14 22:33:11 +00:00
KDSBrowne
4a54cf4bd6 set default text alignment on mount 2022-11-13 18:15:17 +00:00
Ramón Souza
4508a1e567 fix issue with slides not changing after upload 2022-11-08 15:39:16 -03:00
germanocaumo
fa44ee4259 fix(tldraw): don't lose undo/redo stack on resize/fullscreen 2022-11-01 10:46:17 +00:00
germanocaumo
38725cff7f fix(tldraw): update tldraw to latest version +
Small refactor in Cursor component, fix same key warning in console.
2022-10-31 17:07:03 +00:00
germanocaumo
1c6e862d54 fix(tldraw): text losing focus on mobile
Fixs unable to type text on mobile (the keybaord was immeditaly being closed when starting the annotation).
2022-10-31 16:47:45 +00:00
germanocaumo
5d4af2d9df fix(tldraw): change language via settings + fix
Correctly updates the current tldraw language when you change the bbb language in Settings.
Fix some languages not being detected in tldraw.
2022-10-31 16:42:38 +00:00
KDSBrowne
ae1688c9e7 handle rtl menu position 2022-10-27 17:16:44 +00:00
KDSBrowne
c42929be79 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into bbb-15888 2022-10-27 13:19:15 +00:00
KDSBrowne
6c4797e814 fix styles menu overlap on whiteboard toolbar 2022-10-27 13:15:09 +00:00
germanocaumo
226f079c07 fix(tldraw): don't patch state when no shapes were removed 2022-10-25 15:53:19 +00:00
germanocaumo
835cf4f753 fix(whiteboard): diff shape update + shape permission +
Several improvements to tldraw whiteboard:
 - Only send the shape diff on shape updates (reduce a lot the message traffic)
 - Shape permissions (don't allow others to select/edit unless you are presenter/moderator)
  - This required some changes in akka model
 - Tldraw state patch changes to improve stability with fast updates (fix several crashes)
2022-10-21 14:05:31 +00:00
germanocaumo
0e4f88d4b6 fix(tldraw): zoom inconsistency on some cases
Fix some unwanted zooms
2022-10-19 15:13:08 +00:00
germanocaumo
8f41ab31da fix(tldraw): persist bound shapes (arrows) + fix sending unneeded changes 2022-10-05 20:43:48 +00:00
germanocaumo
2fa76d60c4 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-shape-updates 2022-10-05 19:56:54 +00:00
germanocaumo
e1ee782294 fix(whiteboard): several zoom fixes
Sometimes when whiteboard props change (mainly resizes), the tldraw component gets
mounted again, resetting its camera, and was causing zoom to be applied incorrectly.
I've added a useEffect to better react to when the camera resets and reset to the corret zoom.
2022-09-30 14:35:29 +00:00
germanocaumo
ae7eb92c86 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-disable-select 2022-09-21 18:10:05 +00:00
Ramón Souza
7d7f26ea55
Merge pull request #15624 from KDSBrowne/bbb-text-updates
fix: Restore Text Shape Updates Per Character
2022-09-14 13:06:10 -03:00
Joao Victor
36864a8880 fix(whiteboard toolbar): reduce offset from the bottom 2022-09-07 11:34:54 -03:00
germanocaumo
1db9fdacb1 fix(tldraw): disable selecting shapes on certain cases
- For presenter/multiuser Don't allow selecting the background shape (could be done with right click on empty area)
- For viewers: don't allow selecting anything (also hides the selection brush)
2022-09-02 20:59:03 +00:00
germanocaumo
87544a8b38 fix(tldraw): correctly sync draw shape updates +
Refactor how shape updates are parsed from tldraw, instead of doing it manually in each action,
uses the tldraw provided list of what changed available in the "onChangePage" callback, simplifying a lot of our code.
2022-09-02 19:26:26 +00:00
KDSBrowne
3277286525 persist patched text changes 2022-08-31 19:01:53 +00:00
Joao Victor
aefc5c6c6a Merge branch 'v2.6.x-release' into issue-15536 2022-08-31 10:47:58 -03:00
germanocaumo
105ed256c3 fix: tldraw not changing pages correctly 2022-08-29 12:27:17 +00:00
germanocaumo
61cb5b8ef4 fix(tldraw): fit to width / presenter / slide changing 2022-08-23 18:19:17 +00:00
germanocaumo
0e7c27968e Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 18:11:40 +00:00
KDSBrowne
eb7c3dcbc8 update pan tool button after zoom changes 2022-08-22 16:55:44 +00:00
João Victor Nunes
aba9d86904
Merge branch 'v2.6.x-release' into issue-15276 2022-08-22 13:05:25 -03:00
germanocaumo
c948f39392 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-viewbox-sync 2022-08-22 15:47:51 +00:00
germanocaumo
f209fd17c1 Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 15:43:04 +00:00
KDSBrowne
1de4b3f644 update cursor position handling | temp hide eraser animation 2022-08-22 14:37:34 +00:00
Ramón Souza
9303c598c1
Merge pull request #15532 from KDSBrowne/bbb-responsive-wb-toolbar
fix: Make Whiteboard Toolbar Responsive to Smaller Sizes
2022-08-22 11:33:46 -03:00
KDSBrowne
9c018ee6db restore large toolbar size when view enlarged 2022-08-21 21:38:54 +00:00
germanocaumo
7bf8668f23 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-viewbox-sync 2022-08-18 18:41:27 +00:00
germanocaumo
99549d880f fix(tldraw): fit-to-width / presenter change view area sync
- Correctly sync the viewed area when in fit-to-width mode and when the presenter reloades the page or the presenter changes to another user.
2022-08-18 18:18:02 +00:00
germanocaumo
d4b8bdce7e fix(tldraw): sync viewed area between presenter/viewers +
- Return to the ResizeAndMoveSlide event to do pan&zoom, respecting the viewed width and height ratio
- Defaults zoom in toolbar to 100% like before to be more consistent
- Fit to width and Reset Zoom is back (fit tho width still has some sync problems)
- Fix to not change to first page when presenter reloads page
2022-08-16 12:12:43 +00:00
KDSBrowne
12a324631f update cursor type when pan enabled 2022-08-15 13:02:56 +00:00
KDSBrowne
26f3e5dc3f add pan button to presentation toolbar 2022-08-14 22:49:39 +00:00
KDSBrowne
df0fc0da15 make whiteboard toolbar responsive to small screens 2022-08-12 19:08:26 +00:00
Joao Victor
60857a0056 fix(tldraw): hide context menu for users who don't have access to whiteboard 2022-08-11 13:38:17 -03:00
KDSBrowne
3ebfdef9bd use api toolbar general position | sync current locale 2022-08-08 22:47:51 +00:00
KDSBrowne
48cc57dbaf move variable definition 2022-08-03 14:30:22 +00:00
KDSBrowne
b66e44a4cb Upgrade tldraw to latest version 2022-08-03 14:19:12 +00:00
KDSBrowne
a485f372f6 fix console error 2022-07-27 18:46:44 +00:00
KDSBrowne
9234dee077 fix viewer wb crash switching to rtl 2022-07-20 19:54:23 +00:00
KDSBrowne
db41932fe7 update render wb condition | add operator 2022-07-20 19:20:46 +00:00
KDSBrowne
21f2a441ee update editable whiteboard component key 2022-07-20 19:03:26 +00:00
KDSBrowne
fb63975a7e fix viewer WB crash when resizing 2022-07-20 18:50:13 +00:00
KDSBrowne
ed55d58b01 handle cursor positions for video focus 2022-07-19 03:37:47 +00:00
Anton Georgiev
1393e4a7de
Merge pull request #15352 from germanocaumo/tldraw-z-f
fix(tldraw): initial/viewer zoom fixes + presToolbar height
2022-07-13 09:42:36 -04:00
Anton Georgiev
70c084bfdb
Merge pull request #15300 from JoVictorNunes/fix-focus-loss-Jun-30
fix: disable Tldraw autofocus
2022-07-13 09:39:06 -04:00
Anton Georgiev
20762cfac6
Merge pull request #15310 from germanocaumo/tldraw-production-fix
fix(tldraw): fix shapes not persisting in production +
2022-07-13 09:36:44 -04:00
germanocaumo
217fd6c06e fix(tldraw): wrong initial/viewer zoom
Fixes a case when the presentation is just uploaded and a wrong initial zoom was set.
Also fix viewer zoom not correclty adjusting to the area size when zoomed out.
2022-07-08 15:06:00 +00:00
germanocaumo
8cacd96a0c fix(tldraw): fix shapes not persisting in production +
Tldraw uses the constructor name for session complete names:
80ed0bf27b/packages/tldraw/src/state/TldrawApp.ts (L2916)
So in production they are changed because of js minifier.

I changed the onCommand reactor to be one generic for all session:complete actions.
Also fixed some crashes with grouping and ungrouping shapes, in those cases the order of adding/removing is important because children have a reference to the father (grouping shape).
2022-07-02 14:16:45 +00:00
KDSBrowne
438afa7db1 fix RTL cursor position 2022-06-30 16:48:42 +00:00
Joao Victor
ddcaa9590f fix: disable Tldraw autofocus 2022-06-30 13:23:35 -03:00
Ramón Souza
1181b54a55
Merge pull request #15279 from KDSBrowne/2.6-mobile-cursor-fix
Fix Cursor Not Updating For Mobile
2022-06-30 14:10:11 +01:00
KDSBrowne
bf62362162 only render cursor label when mutiuser enabled 2022-06-29 20:27:14 +00:00
KDSBrowne
c702cc34a4 remove cursors from wb when multiuser is disabled 2022-06-28 20:13:05 +00:00
KDSBrowne
33e19124c1 disable shape selection for users without multiuser access 2022-06-28 19:16:35 +00:00
KDSBrowne
2d7ef92581 disable hover highlight for background slide image 2022-06-28 14:15:20 +00:00
Ramón Souza
97f6857fd3
Merge pull request #15189 from KDSBrowne/2.6-disable-fd
fix: Disable File Drop on Whiteboard
2022-06-20 13:19:34 +01:00
KDSBrowne
4f9f9c11d3 fix viewer zoom reset when presenter remounts presentation 2022-06-17 00:35:27 +00:00
KDSBrowne
8dac344f43 replace zoom minBound with zoomed state 2022-06-15 19:46:06 +00:00
KDSBrowne
5828ed2149 add comment 2022-06-15 17:55:14 +00:00
KDSBrowne
6546b32585 disable dropping of assets on whiteboard 2022-06-15 17:43:58 +00:00
KDSBrowne
6d4d11a34d fix cursors lock for viewers 2022-06-02 15:00:28 +00:00
germanocaumo
07a3a915c0 feat(whiteboard): poll result, zoom fit slide +
- Poll result as text shape in the lower right-hand
- Include all tldraw shape bounds as size in akka (to help Daniel rendering in pdf export)
- Default/initital zoom will be centered in the slide and maximize the size according to the presentation area
- Also limited the max zoom out to be the one that fits the slide, to be similar as we had before
2022-05-31 19:40:31 +00:00
KDSBrowne
f683740a2e allow pan when multiuser enabled 2022-05-30 14:51:08 +00:00
KDSBrowne
d404bd3e0f disable pan when multiuser access is off 2022-05-29 15:14:39 +00:00
KDSBrowne
626259bf33 move multi user WB button to presentation toolbar (100% width) | reduce zoom increment 2022-05-25 23:25:53 +00:00
germanocaumo
0bfda4bc53 fix persist of other tldraw shape operations (including groups and copy/paste) +
fix shape not persisting when other user than the owner changed it
2022-05-20 17:14:32 +00:00
germanocaumo
dc56b969ed fix viewer crash when there is no presentation + some cleanup 2022-05-20 12:12:58 +00:00
germanocaumo
3a156ace07 fix camera zoom bugs and mantain zoom when switching slides 2022-05-19 17:24:47 +00:00
KDSBrowne
73c58a6750 show undo | redo UI + preserve zoom state on reload 2022-05-19 02:32:32 +00:00
germanocaumo
386eb595ee redo working locally 2022-05-19 00:52:45 +00:00
germanocaumo
19d4caec99 refactor tldraw doc state to not crash on fast updates +
change slide going  and controlled by akka messages
undo is working locally
2022-05-18 19:35:42 +00:00
KDSBrowne
e9208cad16 remove hard coded slide dimensions 2022-05-17 12:19:10 +00:00
KDSBrowne
39dd622cab handle move_to_page event 2022-05-16 19:29:21 +00:00
KDSBrowne
920d1def89 restore presentation toolbar 2022-05-16 02:35:17 +00:00
KDSBrowne
6cd5006999 add client logger to try / catch 2022-05-13 15:15:44 +00:00
KDSBrowne
fada3284ab fix reported bugs 2022-05-13 14:51:41 +00:00
germanocaumo
45febec644 panAndZoom through akka + some cleanup 2022-05-13 02:47:41 +00:00
KDSBrowne
9961cef474 reposition tldraw toolbar 2022-05-13 02:47:40 +00:00
germanocaumo
cee766d1b6 cursor updates through akka 2022-05-13 02:47:40 +00:00
germanocaumo
234b2869e5 WIP: tldraw in akka-model & starting cleanup 2022-05-13 02:47:39 +00:00
KDSBrowne
3ee7297d79 add isLocked to background images 2022-05-13 02:43:41 +00:00
KDSBrowne
36b1fccbca handle sending shapes in onCommand instead of onPersist 2022-05-13 02:43:40 +00:00
KDSBrowne
10c8d3759d hack adding pres slide images and page switching 2022-05-13 02:43:40 +00:00
KDSBrowne
39e76da995 fix moving linked shape bug | embed cursors with relative position 2022-05-13 02:21:36 +00:00
KDSBrowne
86e7dd52f6 fix shapes overwriting each other 2022-05-13 02:21:36 +00:00