Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

fix(dialog): mdc-web v1 upgrade #779

Merged
merged 3 commits into from
Mar 29, 2019
Merged

fix(dialog): mdc-web v1 upgrade #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc2a4bf
feat(dialog): upgrade mdc-web to v1
gugu Mar 27, 2019
9d38cd3
fix(dialog): add default values to actions
gugu Mar 29, 2019
b9891f7
fix(dialog): make setEscapeKeyAction optional
gugu Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 89 additions & 87 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@material/card": "^0.41.0",
"@material/checkbox": "^0.41.0",
"@material/chips": "^1.0.0",
"@material/dialog": "^0.43.0",
"@material/dialog": "^1.1.0",
"@material/dom": "^0.41.0",
"@material/drawer": "^1.0.1",
"@material/fab": "^0.41.0",
Expand Down
30 changes: 16 additions & 14 deletions packages/dialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
import * as React from 'react';
import classnames from 'classnames';

// @ts-ignore no .d.ts file
import {MDCDialogFoundation, MDCDialogAdapter, util} from '@material/dialog/dist/mdc.dialog';
// @ts-ignore no .d.ts file
import {ponyfill} from '@material/dom/dist/mdc.dom';
import {MDCDialogFoundation} from '@material/dialog/foundation';
import {MDCDialogAdapter} from '@material/dialog/adapter';
import {createFocusTrapInstance, isScrollable, areTopsMisaligned} from '@material/dialog/util';
import {strings} from '@material/dialog/constants';
import {ponyfill} from '@material/dom';
/* eslint-disable no-unused-vars */
import DialogContent, {DialogContentProps} from './DialogContent';
import DialogFooter, {DialogFooterProps} from './DialogFooter';
Expand Down Expand Up @@ -89,7 +90,7 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
DialogState
> {
focusTrap?: FocusTrap;
foundation: MDCDialogFoundation;
foundation!: MDCDialogFoundation;
dialogElement: React.RefObject<HTMLElement> = React.createRef();
labelledBy?: string;
describedBy?: string;
Expand All @@ -103,6 +104,8 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
id: 'mdc-dialog',
open: false,
role: 'alertdialog',
escapeKeyAction: strings.CLOSE_ACTION,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you document these in the Readme, and also document the defaults.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Defaults are already written in readme. Do I need to add anything extra?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

scrimClickAction: strings.CLOSE_ACTION,
};

state: DialogState = {classList: new Set()};
Expand All @@ -116,7 +119,7 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
this.open();
}
if (!autoStackButtons) {
this.foundation.setAutoStackButtons(autoStackButtons);
this.foundation.setAutoStackButtons(autoStackButtons!);
}

if (typeof escapeKeyAction === 'string') { // set even if empty string
Expand All @@ -136,15 +139,15 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
const {open, autoStackButtons, escapeKeyAction, scrimClickAction} = this.props;

if (prevProps.autoStackButtons !== autoStackButtons) {
this.foundation.setAutoStackButtons(autoStackButtons);
this.foundation.setAutoStackButtons(autoStackButtons!);
}

if (prevProps.escapeKeyAction !== escapeKeyAction) {
this.foundation.setEscapeKeyAction(escapeKeyAction);
this.foundation.setEscapeKeyAction(escapeKeyAction!);
}

if (prevProps.scrimClickAction !== scrimClickAction) {
this.foundation.setScrimClickAction(scrimClickAction);
this.foundation.setScrimClickAction(scrimClickAction!);
}

if (prevProps.open !== open) {
Expand Down Expand Up @@ -181,13 +184,12 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
};

private initializeFocusTrap = (): void => {
this.focusTrap = this.props.children && util.createFocusTrapInstance(this.dialogElement.current);
this.focusTrap = this.props.children && createFocusTrapInstance(this.dialogElement.current!);
};

get adapter(): Partial<MDCDialogAdapter> {
get adapter(): MDCDialogAdapter {
const strings = MDCDialogFoundation.strings;
const {closest, matches} = ponyfill;
const {isScrollable, areTopsMisaligned} = util;
return {
addClass: (className: string) => {
const {classList} = this.state;
Expand Down Expand Up @@ -258,8 +260,8 @@ class Dialog<T extends HTMLElement = HTMLElement> extends React.Component<
};

handleInteraction = (e: React.MouseEvent<HTMLElement> | React.KeyboardEvent<HTMLElement>): void =>
this.foundation.handleInteraction(e);
handleDocumentKeyDown = (e: Event): void =>
this.foundation.handleInteraction(e.nativeEvent);
handleDocumentKeyDown = (e: KeyboardEvent): void =>
this.foundation.handleDocumentKeydown(e);
handleLayout = (): void => this.foundation.layout();

Expand Down
4 changes: 2 additions & 2 deletions packages/dialog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"dialog"
],
"dependencies": {
"@material/dialog": "0.43.0",
"@material/dom": "^0.41.0",
"@material/dialog": "1.1.0",
"@material/dom": "^1.0.0",
"@material/react-button": "^0.11.0",
"classnames": "^2.2.6",
"focus-trap": "^4.0.2",
Expand Down
Loading