Skip to content

Commit

Permalink
fix(Viewer): Remove WebviewIntentProvider
Browse files Browse the repository at this point in the history
In commit 97f28ff, WebviewIntentProvider has been added to ViewerContainer, in order to call intent's methods in the container children.

This is not needed because we expect the webapp to
implemented on the root level.

Also, this would produce a bug because
WebviewIntentProvider is not mean to be declared
twice in a same webapp.

When doing so, the child WebviewIntentProvider
would overwrite the parent one on the flagship app side.
So when opening the Viewer, the parent provider
would stop working.
  • Loading branch information
Merkur39 committed Mar 26, 2024
1 parent bbd25d0 commit edfdc1d
Showing 1 changed file with 27 additions and 31 deletions.
58 changes: 27 additions & 31 deletions react/Viewer/ViewerContainer.jsx
Expand Up @@ -2,8 +2,6 @@ import React, { createRef } from 'react'
import PropTypes from 'prop-types'
import cx from 'classnames'

import { WebviewIntentProvider } from 'cozy-intent'

import useBreakpoints from '../providers/Breakpoints'
import { FileDoctype } from '../proptypes'
import { useExtendI18n } from '../providers/I18n'
Expand Down Expand Up @@ -52,39 +50,37 @@ const ViewerContainer = props => {
}

return (
<WebviewIntentProvider>
<AlertProvider>
<ActionMenuProvider editPathByModelProps={editPathByModelProps}>
<div
id="viewer-wrapper"
className={cx(styles['viewer-wrapper'], className)}
>
<EncryptedProvider url={currentURL}>
<Viewer
{...rest}
componentsProps={componentsPropsWithDefault}
currentFile={currentFile}
hasPrevious={hasPrevious}
hasNext={hasNext}
validForPanel={validForPanel}
toolbarRef={toolbarRef}
>
{children}
</Viewer>
</EncryptedProvider>
<ViewerInformationsWrapper
isPublic={isPublic}
disableFooter={disableFooter}
validForPanel={validForPanel}
<AlertProvider>
<ActionMenuProvider editPathByModelProps={editPathByModelProps}>
<div
id="viewer-wrapper"
className={cx(styles['viewer-wrapper'], className)}
>
<EncryptedProvider url={currentURL}>
<Viewer
{...rest}
componentsProps={componentsPropsWithDefault}
currentFile={currentFile}
hasPrevious={hasPrevious}
hasNext={hasNext}
validForPanel={validForPanel}
toolbarRef={toolbarRef}
>
{children}
</ViewerInformationsWrapper>
</div>
</ActionMenuProvider>
</AlertProvider>
</WebviewIntentProvider>
</Viewer>
</EncryptedProvider>
<ViewerInformationsWrapper
isPublic={isPublic}
disableFooter={disableFooter}
validForPanel={validForPanel}
currentFile={currentFile}
toolbarRef={toolbarRef}
>
{children}
</ViewerInformationsWrapper>
</div>
</ActionMenuProvider>
</AlertProvider>
)
}

Expand Down

0 comments on commit edfdc1d

Please sign in to comment.