fix(etherpad) fix loading Etherpad on web
Fixes: https://github.com/jitsi/jitsi-meet/issues/10486
This commit is contained in:
parent
991a0e22a8
commit
8393118330
|
@ -0,0 +1,65 @@
|
||||||
|
// @flow
|
||||||
|
|
||||||
|
import { createToolbarEvent, sendAnalytics } from '../../analytics';
|
||||||
|
import { translate } from '../../base/i18n';
|
||||||
|
import { IconShareDoc } from '../../base/icons';
|
||||||
|
import { connect } from '../../base/redux';
|
||||||
|
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
||||||
|
import { navigate } from '../../conference/components/native/ConferenceNavigationContainerRef';
|
||||||
|
import { screen } from '../../conference/components/native/routes';
|
||||||
|
|
||||||
|
|
||||||
|
type Props = AbstractButtonProps;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implements an {@link AbstractButton} to open the chat screen on mobile.
|
||||||
|
*/
|
||||||
|
class SharedDocumentButton extends AbstractButton<Props, *> {
|
||||||
|
accessibilityLabel = 'toolbar.accessibilityLabel.document';
|
||||||
|
icon = IconShareDoc;
|
||||||
|
label = 'toolbar.documentOpen';
|
||||||
|
tooltip = 'toolbar.documentOpen';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles clicking / pressing the button, and opens / closes the appropriate dialog.
|
||||||
|
*
|
||||||
|
* @private
|
||||||
|
* @returns {void}
|
||||||
|
*/
|
||||||
|
_handleClick() {
|
||||||
|
const { handleClick } = this.props;
|
||||||
|
|
||||||
|
if (handleClick) {
|
||||||
|
handleClick();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
sendAnalytics(createToolbarEvent(
|
||||||
|
'toggle.etherpad',
|
||||||
|
{
|
||||||
|
enable: true
|
||||||
|
}));
|
||||||
|
|
||||||
|
navigate(screen.conference.sharedDocument);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps part of the redux state to the component's props.
|
||||||
|
*
|
||||||
|
* @param {Object} state - The redux store/state.
|
||||||
|
* @param {Object} ownProps - The properties explicitly passed to the component
|
||||||
|
* instance.
|
||||||
|
* @returns {Object}
|
||||||
|
*/
|
||||||
|
function _mapStateToProps(state: Object, ownProps: Object) {
|
||||||
|
const { documentUrl } = state['features/etherpad'];
|
||||||
|
const { visible = Boolean(documentUrl) } = ownProps;
|
||||||
|
|
||||||
|
return {
|
||||||
|
visible
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default translate(connect(_mapStateToProps)(SharedDocumentButton));
|
|
@ -1,12 +1,13 @@
|
||||||
// @flow
|
// @flow
|
||||||
|
|
||||||
|
import type { Dispatch } from 'redux';
|
||||||
|
|
||||||
import { createToolbarEvent, sendAnalytics } from '../../analytics';
|
import { createToolbarEvent, sendAnalytics } from '../../analytics';
|
||||||
import { translate } from '../../base/i18n';
|
import { translate } from '../../base/i18n';
|
||||||
import { IconShareDoc } from '../../base/icons';
|
import { IconShareDoc } from '../../base/icons';
|
||||||
import { connect } from '../../base/redux';
|
import { connect } from '../../base/redux';
|
||||||
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
||||||
import { navigate } from '../../conference/components/native/ConferenceNavigationContainerRef';
|
import { toggleDocument } from '../../etherpad/actions';
|
||||||
import { screen } from '../../conference/components/native/routes';
|
|
||||||
|
|
||||||
|
|
||||||
type Props = AbstractButtonProps & {
|
type Props = AbstractButtonProps & {
|
||||||
|
@ -14,7 +15,12 @@ type Props = AbstractButtonProps & {
|
||||||
/**
|
/**
|
||||||
* Whether the shared document is being edited or not.
|
* Whether the shared document is being edited or not.
|
||||||
*/
|
*/
|
||||||
_editing: boolean
|
_editing: boolean,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redux dispatch function.
|
||||||
|
*/
|
||||||
|
dispatch: Dispatch<any>,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -53,7 +59,7 @@ class SharedDocumentButton extends AbstractButton<Props, *> {
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
*/
|
*/
|
||||||
_handleClick() {
|
_handleClick() {
|
||||||
const { _editing, handleClick } = this.props;
|
const { _editing, dispatch, handleClick } = this.props;
|
||||||
|
|
||||||
if (handleClick) {
|
if (handleClick) {
|
||||||
handleClick();
|
handleClick();
|
||||||
|
@ -67,7 +73,7 @@ class SharedDocumentButton extends AbstractButton<Props, *> {
|
||||||
enable: !_editing
|
enable: !_editing
|
||||||
}));
|
}));
|
||||||
|
|
||||||
navigate(screen.conference.sharedDocument);
|
dispatch(toggleDocument());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -1,2 +1,2 @@
|
||||||
export { default as SharedDocument } from './native/SharedDocument';
|
export { default as SharedDocument } from './native/SharedDocument';
|
||||||
export { default as SharedDocumentButton } from './SharedDocumentButton';
|
export { default as SharedDocumentButton } from './SharedDocumentButton.native';
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
export { default as SharedDocumentButton } from './SharedDocumentButton';
|
export { default as SharedDocumentButton } from './SharedDocumentButton.web';
|
||||||
|
|
Loading…
Reference in New Issue