Skip to content

Commit 723a92a

Browse files
committed
Update SUIR and react-popper
1 parent 3d371de commit 723a92a

File tree

5 files changed

+60
-82
lines changed

5 files changed

+60
-82
lines changed

indico/modules/rb/client/js/components/App.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import PropTypes from 'prop-types';
1010
import React from 'react';
1111
import Overridable from 'react-overridable';
1212
import {connect} from 'react-redux';
13+
import MediaQuery from 'react-responsive';
1314
import {Link, Redirect, Route, Switch} from 'react-router-dom';
14-
import {Dimmer, Header, Icon, Loader, Responsive, Segment, Sidebar} from 'semantic-ui-react';
15+
import {Dimmer, Header, Icon, Loader, Segment, Sidebar} from 'semantic-ui-react';
1516

1617
import {Translate} from 'indico/react/i18n';
1718
import {ConditionalRoute} from 'indico/react/util';
@@ -136,9 +137,9 @@ class App extends React.Component {
136137
<h1>
137138
<Link to="/" onClick={() => resetPageState('bookRoom')}>
138139
<Icon name={iconName} />
139-
<Responsive as="span" minWidth={500}>
140+
<MediaQuery as="span" minWidth={500}>
140141
{title}
141-
</Responsive>
142+
</MediaQuery>
142143
</Link>
143144
</h1>
144145
</div>

indico/web/client/js/react/components/principals/PermissionTree.jsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,10 @@ const PermissionTree = ({tree, permissionMap, exclude, hide, disabled, onSelect}
3838
trigger={triggerFactory(id, itemDisabled)}
3939
content={description}
4040
position="right center"
41-
popperModifiers={{
42-
hide: {
43-
enabled: false,
44-
},
45-
preventOverflow: {
46-
enabled: false,
47-
},
48-
}}
41+
popperModifiers={[
42+
{name: 'hide', enabled: false},
43+
{name: 'preventOverflow', enabled: false},
44+
]}
4945
inverted
5046
/>
5147
</div>

indico/web/client/js/react/components/principals/PrincipalPermissions.jsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,10 @@ const PrincipalPermissions = ({
6666
<Popup
6767
key={permission}
6868
position="right center"
69-
popperModifiers={{
70-
hide: {
71-
enabled: false,
72-
},
73-
preventOverflow: {
74-
enabled: false,
75-
},
76-
}}
69+
popperModifiers={[
70+
{name: 'hide', enabled: false},
71+
{name: 'preventOverflow', enabled: false},
72+
]}
7773
trigger={
7874
<Label as="div" size="tiny" color={permissionMap[permission].color}>
7975
{permissionMap[permission].title}

package-lock.json

Lines changed: 46 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"react-markdown": "^5.0.3",
6767
"react-modal": "^3.12.1",
6868
"react-overridable": "^0.0.3",
69-
"react-popper": "^1.3.7",
69+
"react-popper": "^2.2.4",
7070
"react-redux": "^7.2.2",
7171
"react-responsive": "^8.1.1",
7272
"react-router": "^5.2.0",
@@ -79,7 +79,7 @@
7979
"redux-thunk": "^2.3.0",
8080
"reselect": "^4.0.0",
8181
"selectize": "^0.12.6",
82-
"semantic-ui-react": "^1.3.1",
82+
"semantic-ui-react": "^2.0.1",
8383
"shortid": "^2.2.16",
8484
"slugify": "^1.4.6",
8585
"tablesorter": "^2.31.3",

0 commit comments

Comments
 (0)