-
Notifications
You must be signed in to change notification settings - Fork 295
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into new/#6966-ad-blocking-recovery-onboarding.
- Loading branch information
Showing
58 changed files
with
1,701 additions
and
634 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| /** | ||
| * ModalDialog component. | ||
| * | ||
| * Site Kit by Google, Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * External dependencies | ||
| */ | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { useInstanceId } from '@wordpress/compose'; | ||
| import { createInterpolateElement } from '@wordpress/element'; | ||
| import { sprintf, __ } from '@wordpress/i18n'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import { | ||
| SpinnerButton, | ||
| Dialog, | ||
| DialogTitle, | ||
| DialogContent, | ||
| DialogFooter, | ||
| } from 'googlesitekit-components'; | ||
| import Link from './Link'; | ||
|
|
||
| const ModalDialog = ( { | ||
| dialogActive, | ||
| handleDialog, | ||
| title, | ||
| provides, | ||
| handleConfirm, | ||
| subtitle, | ||
| confirmButton, | ||
| dependentModules, | ||
| danger, | ||
| inProgress = false, | ||
| } ) => { | ||
| const instanceID = useInstanceId( ModalDialog ); | ||
| const describedByID = `googlesitekit-dialog-description-${ instanceID }`; | ||
| const hasProvides = !! ( provides && provides.length ); | ||
|
|
||
| return ( | ||
| <Dialog | ||
| open={ dialogActive } | ||
| aria-describedby={ hasProvides ? describedByID : undefined } | ||
| tabIndex="-1" | ||
| > | ||
| <DialogTitle>{ title }</DialogTitle> | ||
| { | ||
| // Ensure we don't render anything at all if subtitle is falsy, as Dialog expects all its children to be elements and a falsy value will result in an error. | ||
| subtitle ? <p className="mdc-dialog__lead">{ subtitle }</p> : [] | ||
| } | ||
| <DialogContent> | ||
| { hasProvides && ( | ||
| <section | ||
| id={ describedByID } | ||
| className="mdc-dialog__provides" | ||
| > | ||
| <ul className="mdc-list mdc-list--underlined mdc-list--non-interactive"> | ||
| { provides.map( ( attribute ) => ( | ||
| <li className="mdc-list-item" key={ attribute }> | ||
| <span className="mdc-list-item__text"> | ||
| { attribute } | ||
| </span> | ||
| </li> | ||
| ) ) } | ||
| </ul> | ||
| </section> | ||
| ) } | ||
| { dependentModules && ( | ||
| <p className="mdc-dialog__dependencies"> | ||
| { createInterpolateElement( | ||
| sprintf( | ||
| /* translators: %s is replaced with the dependent modules. */ | ||
| __( | ||
| '<strong>Note:</strong> %s', | ||
| 'google-site-kit' | ||
| ), | ||
| dependentModules | ||
| ), | ||
| { | ||
| strong: <strong />, | ||
| } | ||
| ) } | ||
| </p> | ||
| ) } | ||
| </DialogContent> | ||
| <DialogFooter> | ||
| <SpinnerButton | ||
| onClick={ handleConfirm } | ||
| danger={ danger } | ||
| disabled={ inProgress } | ||
| isSaving={ inProgress } | ||
| > | ||
| { confirmButton || __( 'Disconnect', 'google-site-kit' ) } | ||
| </SpinnerButton> | ||
| <Link | ||
| className="googlesitekit-margin-left-auto mdc-dialog__cancel-button" | ||
| onClick={ handleDialog } | ||
| disabled={ inProgress } | ||
| > | ||
| { __( 'Cancel', 'google-site-kit' ) } | ||
| </Link> | ||
| </DialogFooter> | ||
| </Dialog> | ||
| ); | ||
| }; | ||
|
|
||
| ModalDialog.displayName = 'Dialog'; | ||
|
|
||
| ModalDialog.propTypes = { | ||
| dialogActive: PropTypes.bool, | ||
| handleDialog: PropTypes.func, | ||
| handleConfirm: PropTypes.func.isRequired, | ||
| title: PropTypes.string, | ||
| description: PropTypes.string, | ||
| confirmButton: PropTypes.string, | ||
| danger: PropTypes.bool, | ||
| }; | ||
|
|
||
| ModalDialog.defaultProps = { | ||
| dialogActive: false, | ||
| handleDialog: null, | ||
| title: null, | ||
| description: null, | ||
| confirmButton: null, | ||
| danger: false, | ||
| }; | ||
|
|
||
| export default ModalDialog; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /** | ||
| * ModalDialog Component Stories. | ||
| * | ||
| * Site Kit by Google, Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import ModalDialog from './ModalDialog'; | ||
|
|
||
| const Template = () => ( | ||
| <ModalDialog | ||
| dialogActive | ||
| title="Modal Dialog Title" | ||
| subtitle="Modal Dialog Subtitle" | ||
| provides={ [ | ||
| 'Audience overview', | ||
| 'Top pages', | ||
| 'Top acquisition channels', | ||
| ] } | ||
| handleConfirm={ global.console.log.bind( | ||
| null, | ||
| 'Dialog::handleConfirm' | ||
| ) } | ||
| danger | ||
| /> | ||
| ); | ||
|
|
||
| export const Default = Template.bind( {} ); | ||
| Default.storyName = 'Default'; | ||
| Default.scenario = { | ||
| label: 'Global/ModalDialog', | ||
| }; | ||
|
|
||
| export default { | ||
| title: 'Global/Modal Dialog', | ||
| component: ModalDialog, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.