Skip to content

Commit

Permalink
Merge branch 'master' into fix-preview-versions-behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
@Machoper
Machoper authored Aug 9, 2023
2 parents 26cfd14 + c8f8509 commit e36e113
Show file tree
Hide file tree
Showing 23 changed files with 62 additions and 46 deletions.
2 changes: 1 addition & 1 deletion src/api/Metadata.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class Metadata extends File {
/**
* Returns the custom properties template
*
* @return {Object} temaplte for custom properties
* @return {Object} template for custom properties
*/
getCustomPropertiesTemplate(): MetadataTemplate {
return {
Expand Down
12 changes: 10 additions & 2 deletions src/components/close-button/CloseButton.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
import * as React from 'react';
import classNames from 'classnames';

import { injectIntl, IntlShape } from 'react-intl';

import Button, { ButtonType } from '../button';
import IconClose from '../../icons/general/IconClose';
import { bdlGray65 } from '../../styles/variables';

// @ts-ignore flow import
import messages from '../../common/messages';

import './CloseButton.scss';

export interface CloseButtonProps {
/** Custom class for the close button */
className?: string;
/** Intl object */
intl: IntlShape;
/** onClick handler for the close button */
onClick?: Function;
}

const CloseButton = ({ className, onClick }: CloseButtonProps) => {
const CloseButton = ({ className, intl, onClick }: CloseButtonProps) => {
return (
<Button
aria-label={intl.formatMessage(messages.close)}
className={classNames('bdl-CloseButton', className)}
data-testid="bdl-CloseButton"
onClick={onClick}
Expand All @@ -27,4 +35,4 @@ const CloseButton = ({ className, onClick }: CloseButtonProps) => {
);
};

export default CloseButton;
export default injectIntl(CloseButton);
6 changes: 6 additions & 0 deletions src/components/close-button/__tests__/CloseButton.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ describe('components/close-button/CloseButton', () => {
expect(closeButton).toHaveClass(customClass);
expect(closeButton).toHaveClass('bdl-CloseButton');
});

test('should have an accessibility label', () => {
render(<CloseButton />);
const closeButton = screen.getByRole('button');
expect(closeButton).toHaveAttribute('aria-label');
});
});

describe('onClick()', () => {
Expand Down
1 change: 1 addition & 0 deletions src/components/modal/ModalDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class ModalDialog extends React.Component<Props> {
const divProps = omit(rest, ['children', 'closeButtonProps', 'onRequestClose', 'intl']);

divProps.role = isAlertType ? 'alertdialog' : 'dialog';
divProps['aria-modal'] = true;
divProps['aria-labelledby'] = `${this.modalID}-label`;
if (isAlertType) {
divProps['aria-describedby'] = `${this.modalID}-desc`;
Expand Down
1 change: 1 addition & 0 deletions src/components/modal/__tests__/ModalDialog.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ describe('components/modal/ModalDialog', () => {

test('should set aria props on modal dialog when rendered', () => {
expect(wrapper.prop('role')).toEqual('dialog');
expect(wrapper.prop('aria-modal')).toEqual(true);
expect(wrapper.prop('aria-labelledby')).toEqual(`${instance.modalID}-label`);
});

Expand Down
4 changes: 2 additions & 2 deletions test/explorer-no-react.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
</head>
<body>
<div class="inputs">
Expand Down Expand Up @@ -62,7 +62,7 @@ <h1>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
<script src="../dist/dev/en-US/explorer.no.react.js"></script>
<script src="../dev/en-US/explorer.no.react.js"></script>
<script>
function load() {
const { ContentExplorer } = Box;
Expand Down
12 changes: 6 additions & 6 deletions test/explorer-picker-uploader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
</head>
<body>
<div class="inputs">
Expand Down Expand Up @@ -66,9 +66,9 @@ <h1>Folder Picker</h1>
<h1>Content Uploader</h1>
<div class="uploader1"></div>
</div>
<script src="../dist/dev/en-US/explorer.js"></script>
<script src="../dist/dev/en-US/picker.js"></script>
<script src="../dist/dev/en-US/uploader.js"></script>
<script src="../dev/en-US/explorer.js"></script>
<script src="../dev/en-US/picker.js"></script>
<script src="../dev/en-US/uploader.js"></script>
<script>
function load() {
const { ContentExplorer, FolderPicker, FilePicker, ContentUploader } = Box;
Expand Down
4 changes: 2 additions & 2 deletions test/explorer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
vertical-align: middle;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
</head>
<body>
<div class="inputs">
Expand All @@ -72,7 +72,7 @@ <h1>Content Explorer (no folder upload)</h1>
<h1>Content Explorer (grid view)</h1>
<div class="explorer4"></div>
</div>
<script src="../dist/dev/en-US/explorer.js"></script>
<script src="../dev/en-US/explorer.js"></script>
<script>
function load() {
const { ContentExplorer } = Box;
Expand Down
4 changes: 2 additions & 2 deletions test/openwith.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
margin: 20px;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/openwith.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/openwith.css" />
<script src="https://cdn.polyfill.io/v2/polyfill.js?features=es6,Intl"></script>
<script src="../dist/dev/en-US/openwith.js"></script>
<script src="../dev/en-US/openwith.js"></script>
</head>
<body>
<div class="container">
Expand Down
4 changes: 2 additions & 2 deletions test/pickers-no-react.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
</head>
<body>
<div class="inputs">
Expand Down Expand Up @@ -78,7 +78,7 @@ <h1>Folder Picker (max 3 items / token generator / cannot upload)</h1>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
<script src="../dist/dev/en-US/picker.no.react.js"></script>
<script src="../dev/en-US/picker.no.react.js"></script>
<script>
function load() {
const { FilePicker, FolderPicker } = Box;
Expand Down
4 changes: 2 additions & 2 deletions test/pickers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
</head>
<body>
<div class="inputs">
Expand Down Expand Up @@ -82,7 +82,7 @@ <h1>
<h1>Folder Picker (max 3 items / token generator / no upload)</h1>
<div class="folderPicker2"></div>
</div>
<script src="../dist/dev/en-US/picker.js"></script>
<script src="../dev/en-US/picker.js"></script>
<script>
function load() {
const { FilePicker, FolderPicker, ContentPicker } = Box;
Expand Down
8 changes: 4 additions & 4 deletions test/popups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
background: red;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
</head>
<body>
<div class="inputs">
Expand Down Expand Up @@ -100,8 +100,8 @@ <h1>
<h1>Folder Picker (max 3 items / token generator / no upload)</h1>
<div class="folderPicker2"></div>
</div>
<script src="../dist/dev/en-US/picker.js"></script>
<script src="../dist/dev/en-US/uploader.js"></script>
<script src="../dev/en-US/picker.js"></script>
<script src="../dev/en-US/uploader.js"></script>
<script>
function load() {
const { FilePicker, FolderPicker, ContentPicker, ContentUploader } = Box;
Expand Down
4 changes: 2 additions & 2 deletions test/preview-react-with-sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
width: 100%;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/preview.css" />
<script src="../dist/dev/en-US/preview.js"></script>
<link rel="stylesheet" type="text/css" href="../dev/en-US/preview.css" />
<script src="../dev/en-US/preview.js"></script>
</head>
<body>
<div class="inputs">
Expand Down
4 changes: 2 additions & 2 deletions test/preview-react.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
width: 800px;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/preview.css" />
<script src="../dist/dev/en-US/preview.js"></script>
<link rel="stylesheet" type="text/css" href="../dev/en-US/preview.css" />
<script src="../dev/en-US/preview.js"></script>
</head>
<body>
<div class="inputs">
Expand Down
4 changes: 2 additions & 2 deletions test/preview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
flex-grow: 1;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
<script src="../dist/dev/en-US/explorer.js"></script>
<link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
<script src="../dev/en-US/explorer.js"></script>
</head>

<body>
Expand Down
6 changes: 3 additions & 3 deletions test/pseudo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/picker.css" />
<link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/explorer.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/picker.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/uploader.css" />
</head>
<body>
<div class="inputs">
Expand Down
4 changes: 2 additions & 2 deletions test/sharing-no-react.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
}
</style>

<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sharing.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/sharing.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
</head>
<body>
<script src="../dist/dev/en-US/sharing.no.react.js"></script>
<script src="../dev/en-US/sharing.no.react.js"></script>

<div>
<form class="inputs">
Expand Down
4 changes: 2 additions & 2 deletions test/sharing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
}
</style>

<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sharing.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/sharing.css" />
</head>
<body>
<script src="../dist/dev/en-US/sharing.js"></script>
<script src="../dev/en-US/sharing.js"></script>

<div>
<form class="inputs">
Expand Down
4 changes: 2 additions & 2 deletions test/sidebar-additional-tabs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
margin-bottom: 10px;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sidebar.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/sidebar.css" />
<script src="https://unpkg.com/react/umd/react.development.js"></script>
<script src="../dist/dev/en-US/sidebar.js"></script>
<script src="../dev/en-US/sidebar.js"></script>
</head>
<body>
<div class="sidebar">
Expand Down
4 changes: 2 additions & 2 deletions test/sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<button type="button" onclick="load(true)">Submit</button>
</div>
</div>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sidebar.css" />
<script src="../dist/dev/en-US/sidebar.js"></script>
<link rel="stylesheet" type="text/css" href="../dev/en-US/sidebar.css" />
<script src="../dev/en-US/sidebar.js"></script>
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions test/uploader-no-react.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
</head>

<body>
Expand All @@ -57,7 +57,7 @@ <h1>Content Uploader</h1>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
<script src="../dist/dev/en-US/uploader.no.react.js"></script>
<script src="../dev/en-US/uploader.no.react.js"></script>
<script>
// Set token and folder ID to locally stored values if available
(function() {
Expand Down
4 changes: 2 additions & 2 deletions test/uploader-window-view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
width: 100%;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
</head>

<body>
Expand Down Expand Up @@ -69,7 +69,7 @@ <h1>Upload Manager - Choose File to Upload</h1>
<div class="drop-zone"><h2>Drop Files/Folders Here</h2></div>
<div class="uploader1"></div>
</div>
<script src="../dist/dev/en-US/uploader.js"></script>
<script src="../dev/en-US/uploader.js"></script>
<script>
let resetTimeout;
// Set token and folder ID to locally stored values if available
Expand Down
4 changes: 2 additions & 2 deletions test/uploader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
display: flex;
}
</style>
<link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
<link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
</head>

<body>
Expand All @@ -56,7 +56,7 @@ <h1>Content Uploader</h1>
</div>
<div class="uploader1"></div>
</div>
<script src="../dist/dev/en-US/uploader.js"></script>
<script src="../dev/en-US/uploader.js"></script>
<script>
// Set token and folder ID to locally stored values if available
(function() {
Expand Down

0 comments on commit e36e113

Please sign in to comment.