Merge pull request #196 from bigbluebutton/develop

chore: update from develop

package.json

@@ -1,16 +1,17 @@
 {
   "name": "bbb-playback",
-  "version": "3.4.1",
+  "version": "4.0.0",
   "homepage": "/playback/presentation/2.3",
   "dependencies": {
     "classnames": "^2.3.1",
     "darkreader": "^4.9.46",
-    "linkifyjs": "^2.1.9",
+    "linkify-react": "^3.0.4",
+    "linkifyjs": "^3.0.5",
     "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-intl": "^5.24.8",
-    "react-router-dom": "^5.3.0",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "react-intl": "^5.25.0",
+    "react-router-dom": "^6.3.0",
     "react-scripts": "^4.0.3",
     "sass": "^1.50.0",
     "video.js": "^7.18.1",

src/components/bars/top/buttons/theme.js

@@ -28,7 +28,19 @@ const css = `
 }
 `;
 
-const fixes = { css };
+const ignoreInlineStyle = [
+  'g > circle',
+  'g > line',
+  'g > path',
+  'g > polygon',
+  'g > polyline',
+  'g > foreignObject',
+];
+
+const fixes = {
+  css,
+  ignoreInlineStyle,
+};
 
 const Theme = () => {
   const intl = useIntl();

src/components/chat/messages/system/video/url.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { isEmpty } from 'utils/data/validators';
-import Linkify from 'linkifyjs/react';
+import Linkify from 'linkify-react';
 import cx from 'classnames';
 
 const propTypes = {
@@ -22,6 +22,7 @@ const Url = ({
 
   const options = {
     className: cx('linkified', { inactive: !active }),
+    target: '_blank',
   };
 
   return (

src/components/chat/messages/user/text.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Linkify from 'linkifyjs/react';
+import Linkify from 'linkify-react';
 import cx from 'classnames';
 
 const propTypes = {
@@ -23,6 +23,7 @@ const Text = ({
   if (hyperlink) {
     const options = {
       className: cx('linkified', { inactive: !active }),
+      target: '_blank',
     };
 
     return (

src/components/loader/index.js

@@ -1,4 +1,5 @@
 import React, { useRef, useState } from 'react';
+import { useParams } from "react-router-dom";
 import {
   defineMessages,
   useIntl,
@@ -16,7 +17,7 @@ import layout from 'utils/layout';
 import logger from 'utils/logger';
 import {
   getLayout,
-  getRecordId,
+  parseRecordId,
 } from 'utils/params';
 import './index.scss';
 
@@ -33,8 +34,9 @@ const initError = (recordId) => recordId ? null : ERROR.BAD_REQUEST;
 
 const Loader = ({ match }) => {
   const intl = useIntl();
+  const params = useParams();
+  const recordId = useRef(parseRecordId(params));
   const counter = useRef(0);
-  const recordId = useRef(getRecordId(match));
 
   const [error, setError] = useState(initError(recordId.current));
   const [, setUpdate] = useState(0);