[MM-16541] Remove perfect-scrollbar package (mattermost#4382)

* Remove all usages of perfect scrollbar * Remove perfect scrollbar from package.json
Revanth47 · Dec 4, 2019 · 2bae672 · 2bae672
1 parent a7b38a1
commit 2bae672
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 87 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1755,39 +1755,6 @@ Generic build of Mozilla's PDF.js library.
 
 ---
 
-## perfect-scrollbar
-
-This product contains 'perfect-scrollbar' by Hyunje Jun.
-
-Minimalistic but perfect custom scrollbar plugin
-
-* HOMEPAGE:
- * https://github.com/utatti/perfect-scrollbar#readme
-
-* LICENSE: MIT
-
-The MIT License (MIT) Copyright (c) 2012-2017 Hyunje Jun and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
 ## popmotion
 
 This product contains 'popmotion' by Matt Perry.

diff --git a/components/access_history_modal/access_history_modal.jsx b/components/access_history_modal/access_history_modal.jsx
@@ -1,13 +1,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {Modal} from 'react-bootstrap';
 import {FormattedMessage} from 'react-intl';
 
-import {isMobile} from 'utils/utils.jsx';
 import AuditTable from 'components/audit_table';
 import LoadingScreen from 'components/loading_screen';
 
@@ -47,9 +45,6 @@ export default class AccessHistoryModal extends React.PureComponent {
 
  onShow = () => {
  this.props.actions.getUserAudits(this.props.currentUserId, 0, 200);
- if (!isMobile()) {
- $('.modal-body').perfectScrollbar();
- }
  }
 
  onHide = () => {

diff --git a/components/access_history_modal/access_history_modal.test.jsx b/components/access_history_modal/access_history_modal.test.jsx
@@ -3,8 +3,6 @@
 
 import React from 'react';
 import {shallow} from 'enzyme';
-import $ from 'jquery';
-require('perfect-scrollbar/jquery')($);
 
 import AccessHistoryModal from 'components/access_history_modal/access_history_modal.jsx';
 import AuditTable from 'components/audit_table';

diff --git a/components/activity_log_modal/activity_log_modal.jsx b/components/activity_log_modal/activity_log_modal.jsx
@@ -7,7 +7,6 @@ import React from 'react';
 import {Modal} from 'react-bootstrap';
 import {FormattedMessage} from 'react-intl';
 
-import {isMobile} from 'utils/utils.jsx';
 import ActivityLog from 'components/activity_log_modal/components/activity_log.jsx';
 import LoadingScreen from 'components/loading_screen';
 
@@ -72,9 +71,6 @@ export default class ActivityLogModal extends React.PureComponent {
 
  onShow = () => {
  this.props.actions.getSessions(this.props.currentUserId);
- if (!isMobile()) {
- $('.modal-body').perfectScrollbar();
- }
  }
 
  onHide = () => {

diff --git a/components/activity_log_modal/activity_log_modal.test.jsx b/components/activity_log_modal/activity_log_modal.test.jsx
@@ -3,8 +3,6 @@
 
 import React from 'react';
 import {shallow} from 'enzyme';
-import $ from 'jquery';
-require('perfect-scrollbar/jquery')($);
 
 import {General} from 'mattermost-redux/constants';
 

diff --git a/components/channel_notifications_modal/channel_notifications_modal.jsx b/components/channel_notifications_modal/channel_notifications_modal.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {Modal} from 'react-bootstrap';
@@ -112,10 +111,6 @@ export default class ChannelNotificationsModal extends React.PureComponent {
  }
 
  updateSection = (section = NotificationSections.NONE) => {
- if ($('.section-max').length) {
- $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
- }
-
  this.setState({activeSection: section});
 
  if (section === NotificationSections.NONE) {

diff --git a/components/popover_list_members/popover_list_members.jsx b/components/popover_list_members/popover_list_members.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-import $ from 'jquery';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {Overlay, OverlayTrigger, Tooltip} from 'react-bootstrap';
@@ -49,10 +48,6 @@ export default class PopoverListMembers extends React.Component {
  };
  }
 
- componentDidUpdate() {
- $('.member-list__popover .popover-content .more-modal__body').perfectScrollbar();
- }
-
  static getDerivedStateFromProps(nextProps, prevState) {
  if (nextProps.users !== prevState.users || nextProps.statuses !== prevState.statuses) {
  return {

diff --git a/components/root/root.jsx b/components/root/root.jsx
@@ -2,7 +2,6 @@
 // See LICENSE.txt for license information.
 
 import $ from 'jquery';
-require('perfect-scrollbar/jquery')($);
 
 import PropTypes from 'prop-types';
 import React from 'react';

diff --git a/components/team_general_tab/team_general_tab.jsx b/components/team_general_tab/team_general_tab.jsx
@@ -43,9 +43,6 @@ export default class GeneralTab extends React.Component {
  }
 
  updateSection = (section) => {
- if ($('.section-max').length) {
- $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
- }
  this.setState(this.setupInitialState(this.props));
  this.props.updateSection(section);
  }

diff --git a/components/team_settings_modal/team_settings_modal.jsx b/components/team_settings_modal/team_settings_modal.jsx
@@ -28,28 +28,14 @@ export default class TeamSettingsModal extends React.Component {
  };
  }
 
- componentDidMount() {
- if (!Utils.isMobile()) {
- $('.settings-modal .settings-content').perfectScrollbar();
- }
- }
-
  updateTab = (tab) => {
  this.setState({
  activeTab: tab,
  activeSection: '',
  });
-
- if (!Utils.isMobile()) {
- $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
- }
  }
 
  updateSection = (section) => {
- if ($('.section-max').length) {
- $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update');
- }
-
  this.setState({activeSection: section});
  }
 

diff --git a/components/team_settings_modal/team_settings_modal.test.jsx b/components/team_settings_modal/team_settings_modal.test.jsx
@@ -7,8 +7,6 @@ import React from 'react';
 import {shallowWithIntl} from 'tests/helpers/intl-test-helper';
 import TeamSettingsModal from 'components/team_settings_modal/team_settings_modal.jsx';
 
-require('perfect-scrollbar/jquery')($);
-
 describe('components/team_settings_modal', () => {
  test('should match snapshot', () => {
  const wrapper = shallowWithIntl(<TeamSettingsModal/>);

diff --git a/components/user_settings/modal/user_settings_modal.jsx b/components/user_settings/modal/user_settings_modal.jsx
@@ -111,10 +111,6 @@ class UserSettingsModal extends React.Component {
  }
 
  componentDidUpdate(prevProps, prevState) {
- if (!Utils.isMobile()) {
- $('.settings-content .minimize-settings').perfectScrollbar('update');
- }
-
  if (this.state.active_tab !== prevState.active_tab) {
  $(ReactDOM.findDOMNode(this.modalBodyRef.current)).scrollTop(0);
  }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,6 @@
  "marked": "github:mattermost/marked#8214e10918264fb88cec474196023949f7cb4b30",
  "moment-timezone": "0.5.27",
  "pdfjs-dist": "2.0.489",
- "perfect-scrollbar": "0.8.1",
  "popmotion": "8.7.0",
  "popper.js": "1.16.0",
  "prop-types": "15.7.2",

diff --git a/sass/styles.scss b/sass/styles.scss
@@ -6,7 +6,6 @@
 // Dependencies
 @import '~bootstrap/dist/css/bootstrap.css';
 @import '~jasny-bootstrap/dist/css/jasny-bootstrap.css';
-@import '~perfect-scrollbar/dist/css/perfect-scrollbar.css';
 @import '~font-awesome/css/font-awesome.css';
 @import '~bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css';