Commit Graph

704 Commits

Author SHA1 Message Date
Ramón Souza
470f491352
Merge pull request #15583 from germanocaumo/tldraw-viewbox-sync
fix(tldraw): sync viewed area between presenter/viewers +
2022-08-30 17:00:14 -03:00
Ramón Souza
e7107f87a7
Merge pull request #15598 from ramonlsouza/merge-2526-aug25
chore: Merge v2.5.5 into v2.6
2022-08-29 15:58:53 -03:00
germanocaumo
105ed256c3 fix: tldraw not changing pages correctly 2022-08-29 12:27:17 +00:00
Ramón Souza
62f8ab3cb2 Merge remote-tracking branch 'upstream/v2.6.x-release' into pr-15460-aug26 2022-08-26 14:05:45 -03:00
Ramón Souza
609d43157a Merge tag 'v2.5.5' into merge-2526-aug25 2022-08-25 14:33:44 -03:00
KDSBrowne
45b3166863 Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-24 11:55:38 +00:00
KDSBrowne
c758664651 remove toolbar from non presenter cursor calculation 2022-08-24 11:55:31 +00:00
germanocaumo
61cb5b8ef4 fix(tldraw): fit to width / presenter / slide changing 2022-08-23 18:19:17 +00:00
KDSBrowne
9f7b45b172 hide eraser animation on mobile 2022-08-23 12:08:31 +00:00
KDSBrowne
ab4cb469fb Merge branch 'tldraw-viewbox-sync' of https://github.com/germanocaumo/bigbluebutton into tldraw-viewbox-sync 2022-08-22 19:07:23 +00:00
KDSBrowne
9df18af50f update presentation offset for cursor (mobile) 2022-08-22 19:05:02 +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
Ramón Souza
81b15ae329
Merge pull request #15518 from JoVictorNunes/issue-15291
fix: incorrect calculation of number of users in multi user whiteboard
2022-08-18 10:52:34 -03: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
8e9ca4b2c8 fix: incorrect calculation of number of users in multi user whiteboard 2022-08-11 15:44:16 -03: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
Joao Victor
74c4c1c4cc fix: don't clear text fake annotations 2022-08-08 17:07:41 -03: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
Gabriel Porfirio
8198953f30 removing unused imports 2022-07-28 16:50:31 -03: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
9d8ce2215d remove key prop 2022-07-20 18:51:50 +00:00
KDSBrowne
fb63975a7e fix viewer WB crash when resizing 2022-07-20 18:50:13 +00:00
KDSBrowne
100bfcfb86 update fullscreen element check 2022-07-19 10:51:59 +00:00
KDSBrowne
ed55d58b01 handle cursor positions for video focus 2022-07-19 03:37:47 +00:00
KDSBrowne
47303757de handle cursor position for fullscreen presentation 2022-07-19 01:23:10 +00:00
Ramon Souza
db5ac1428a Merge tag 'v2.5.3' into merge25-26-jul14 2022-07-15 11:08:02 -03: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
Ramón Souza
1b03b1fd50
Merge pull request #15301 from KDSBrowne/z-26-rtl-cursor
Fix RTL Cursor Position on Whiteboard
2022-07-06 21:40:19 +01:00
KDSBrowne
046518abe5 handle cursor positions for smart layout 2022-07-06 20:03:04 +00:00
KDSBrowne
42acca2124 handle cursor position for all custom layout orientations 2022-07-06 17:17:05 +00:00
KDSBrowne
b075cf822b fix delay minimizing presentation | display default cursor for no MUA 2022-07-05 20:16:55 +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
Joao Victor
66d3d2c13b fix: clear fake annotations on multi-user whiteboard off 2022-07-01 14:31:14 -03: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
germanocaumo
c2db91b5f9 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into tldraw-recording 2022-06-30 14:31:08 +00: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
ee6a3dcc62 fix cursor not updating on mobile 2022-06-28 14:25:43 +00:00
KDSBrowne
2d7ef92581 disable hover highlight for background slide image 2022-06-28 14:15:20 +00:00
germanocaumo
853d0dfd9b fix(whiteboard): tldraw recording processing/publishing
Changed the names of tldraw record events to differentiate from before.
Publish tldraw.json file with all shape information during the meeting to be used in playback.
Adapted cursor.xml and panzoom.xml to store tldraw data.
Publish slides svgs to be used by playback's tldraw component (otherwise we have different image sizes in pngs and thus messing the coordinates).
Retro-compatible with old recordings.
2022-06-23 17:04:09 +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
Ramón Souza
d3fc924f10
Merge pull request #15137 from KDSBrowne/2.6-toolbar-zoom-val
Display Correct Zoom Value on Presentation Restore
2022-06-20 13:11:25 +01:00
KDSBrowne
4f9f9c11d3 fix viewer zoom reset when presenter remounts presentation 2022-06-17 00:35:27 +00:00
Ramon Souza
edeb70de0d Merge tag 'v2.5.1' into merge25-26-jun16 2022-06-16 13:58:54 -03: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
08b3659b68 fix(whiteboard): missing import 2022-06-01 13:47: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
f58882ffcc stop rendering curors when they leave the WB area 2022-05-29 16:24:44 +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
c20e54b95d prevent clients crashing when presenter reloads 2022-05-16 19:04:40 +00:00
Joao Victor
7ff6f8750d [2.5] fix(whiteboard): border-radius of toolbar buttons #15009 2022-05-16 10:20:16 -03:00
KDSBrowne
920d1def89 restore presentation toolbar 2022-05-16 02:35:17 +00:00
KDSBrowne
4478f9d389 add const to annotations variable 2022-05-13 15:41:10 +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
00c66cc26e clean up cursor component 2022-05-13 02:21:36 +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
KDSBrowne
5cb29535f7 embed Tldraw into BBB client 2022-05-13 02:21:35 +00:00
Lucas
2db9a1b343
Merge branch 'develop' into develop-bbb 2022-04-26 15:08:43 -03:00
Ramon Souza
76272d8a51 Merge remote-tracking branch 'upstream/v2.5.x-release' into 25-dev-apr19 2022-04-19 11:34:29 -03:00
Joao Victor
62d56eeb00 fix: whiteboard toolbar border-radius 2022-04-19 10:28:02 -03:00
Anton Georgiev
c00b8f5fd9
Merge pull request #14829 from ramonlsouza/issue-6244
feat: Confirm dialog on clear all annotations
2022-04-14 14:55:27 -04:00
Ramon Souza
5b52665cd2 add confirmation modal to clear all annotations whiteboard action 2022-04-14 10:54:53 -03:00
Lucas Zawacki
83847a21aa Merge branch 'v2.5.x-release-Layouts' of github.com:lfzawacki/bigbluebutton into develop-bbb 2022-04-13 21:08:32 +00:00
Anton Georgiev
8ab4023eb5
Merge pull request #14783 from frankemax/bbb-darkmode-25
feat(theme): add dark mode
2022-04-12 10:35:31 -04:00
Max Franke
6b05e431dd feat(theme): add dark mode theme 2022-04-08 16:05:29 -03:00
Joao Victor
9b6c43fa2b Use forEach instead of map 2022-04-07 14:06:51 -03:00
Arthurk12
420bd8b526 refactor(whiteboard): text tool updates
Makes the whiteboard text tool send annotation updates.
Partially reverts 40b18b0662.
2022-03-29 11:46:47 -03:00
Lucas Zawacki
830c44702f feature(layout): Only use one place to store presentationIsOpen 2022-02-24 15:30:53 -03:00
Ramón Souza
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00:00
Ramón Souza
dba04834c7 Merge remote-tracking branch 'upstream/v2.4.x-release' into 2524-feb08 2022-02-09 15:52:42 +00:00
Ramón Souza
115ba187b5 remove unused imports/variables 2022-01-24 13:12:37 +00:00
Anton
7f075be033 fix all test selectors 2022-01-20 10:03:18 -03:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
Ramón Souza
1f42751c23 keep original order of poll answers in whiteboard annotation 2021-12-09 14:20:34 +00:00
hiroshisuga
7b92a61cec
Fix typo: "Unset" -> "Unsent" UnsentAnnotations (#13684) 2021-12-02 09:37:31 -05:00
Ramón Souza
cb04e0b74c whiteboard toolbar component isPresenter rework 2021-11-23 14:51:41 +00:00
Ramón Souza
4415598243 remove duplicated isPresenter in whiteboard annotations text component 2021-11-23 12:50:26 +00:00
hiroshisuga
a8e1462744
fix: Fix wrong annotation codes (#13674)
Fix wrong annotation codes #13674
2021-11-22 10:43:02 -05:00
hiroshisuga
d11ac50112
Update component.jsx 2021-11-20 17:48:41 +09:00
hiroshisuga
4e201fa773
No flickering anymore 2021-11-20 17:35:41 +09:00
Anton Georgiev
542db847ff
Merge pull request #13574 from Tainan404/smooth-reconnection-25
Improve data structure to not break on reconnections
2021-11-17 15:55:21 -05:00
Ramón Souza
34923cc6a0 remove whiteboard toolbar styles 2021-11-11 11:34:45 +00:00
Joao Victor
5e82448be3 fixes the publication for user response polls 2021-11-05 11:11:55 -03:00
Tainan Felipe
f5eef03f3f Improve data structure to not break on reconnections 2021-11-03 14:37:54 -03:00
Anton Georgiev
a654f44011
Merge pull request #13623 from ramonlsouza/styled-components-7
refactor: styled-components conversion - partial
2021-11-03 08:44:04 -04:00
Ramón Souza
1c084c6b8f convert whiteboard-toolbar component 2021-11-02 20:05:49 +00:00
Anton Georgiev
13aba985cb
Merge pull request #10737 from hiroshisuga/fillshape
feat: Fill shape in whiteboard
2021-11-02 15:03:22 -04:00
Ramón Souza
e7b282a127 convert toolbar-submenu component 2021-11-02 17:43:42 +00:00
Ramón Souza
d926c40e64 convert toolbar-submenu-item component 2021-11-02 17:27:25 +00:00
Ramón Souza
f5e0a97c3d convert toolbar-menu-item component 2021-11-02 17:11:41 +00:00
Ramón Souza
f6f47bf25a convert whiteboard annotations component 2021-11-02 16:35:54 +00:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
Anton Georgiev
1622425cbc Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop 2021-10-22 19:12:58 +00:00
Ramón Souza
1cc066366f Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-10-19 16:41:36 +00:00
Ramón Souza
9e71583ec7 restore old minimize presentation button and add a flag to switch 2021-10-14 19:31:47 +00:00
Anton Georgiev
24d672a832 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d Add server side reactivity to publications 2021-10-13 15:00:52 -03:00
hiroshisuga
7ce8e6859a Fix toolbar item vanish 2021-10-04 18:10:19 +00:00
hiroshisuga
0ee8700bfc
Fix toolbar item vanish 2021-10-03 10:25:30 +09:00
Lucas Fialho Zawacki
d7f3924350 Enable swap layout for screenshare and external video 2021-09-27 21:03:20 +00:00
Ramon Souza
a8541eda6e remove linting 2021-09-17 10:38:10 -03:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -03:00
KDSBrowne
aa3601f5fa add aria region & label to whiteboard toolbar 2021-09-13 14:03:40 +00:00
KDSBrowne
a87a0c8867 add aria-expanded to whiteboard toolbar submenu btns 2021-09-13 13:40:22 +00:00
hiroshisuga
75a14932ef fix bug when a coordinate is zero 2021-06-22 13:23:02 +00:00