Use stems for modals everywhere! (#125)

* Remove AudiusModal in favor of Stems Modal * Delete old modal component * Fix misc bugs * Rm log * Fix nested modal bugs * Upgrade stems * Upgrade stems
AudiusProject · Dec 15, 2020 · 877286d · 877286d
1 parent f292add
commit 877286d
Show file tree

Hide file tree

Showing 62 changed files with 540 additions and 1,168 deletions.
diff --git a/packages/web/package-lock.json b/packages/web/package-lock.json
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -6,8 +6,8 @@
   "version": "0.23.0",
   "private": true,
   "dependencies": {
-    "@audius/libs": "1.0.16",
-    "@audius/stems": "0.2.12",
+    "@audius/libs": "^1.0.16",
+    "@audius/stems": "0.3.1",
     "@optimizely/optimizely-sdk": "^4.0.0",
     "@reduxjs/toolkit": "^1.3.2",
     "@sentry/browser": "^5.10.2",

diff --git a/packages/web/src/components/action-sheet-modal/ActionSheetModal.module.css b/packages/web/src/components/action-sheet-modal/ActionSheetModal.module.css
@@ -1,3 +1,7 @@
+.modalBodyStyle {
+  width: 100%;
+}
+
 .container > div {
   height: 56px;
   display: flex;

diff --git a/packages/web/src/components/action-sheet-modal/ActionSheetModal.tsx b/packages/web/src/components/action-sheet-modal/ActionSheetModal.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
+import { Anchor, Modal } from '@audius/stems'
 
-import Modal, { Anchor } from 'components/general/AudiusModal'
 import cn from 'classnames'
 
 import styles from './ActionSheetModal.module.css'
@@ -35,6 +35,7 @@ const ActionSheetModal = ({
 
   return (
     <Modal
+      bodyClassName={styles.modalBodyStyle}
       onClose={onClose}
       isOpen={isOpen}
       anchor={Anchor.BOTTOM}

diff --git a/packages/web/src/components/artist/ArtistPopover.module.css b/packages/web/src/components/artist/ArtistPopover.module.css
@@ -1,3 +1,7 @@
+.overlayStyle {
+  z-index: 20000;
+}
+
 /* Remove the default antd popover arrow */
 .overlayStyle > :global(.ant-popover-content) > :global(.ant-popover-arrow) {
   display: none;

diff --git a/packages/web/src/components/artist/UserListModal.js b/packages/web/src/components/artist/UserListModal.js
@@ -1,8 +1,8 @@
 import React from 'react'
+import { Modal } from '@audius/stems'
 import { connect } from 'react-redux'
 import PropTypes from 'prop-types'
 
-import Modal from 'components/general/Modal'
 import FollowButton from 'components/general/FollowButton'
 import ArtistChip from 'components/artist/ArtistChip'
 import { push as pushRoute } from 'connected-react-router'
@@ -30,9 +30,13 @@ export const UserListModal = props => {
   return (
     <Modal
       title={props.title}
-      width={360}
-      visible={props.visible}
+      showTitleHeader
+      bodyClassName={styles.modalBody}
+      isOpen={props.visible}
       onClose={props.onClose}
+      titleClassName={styles.modalTitle}
+      headerContainerClassName={styles.modalHeader}
+      showDismissButton
     >
       <SimpleBar
         scrollableNodeProps={{ id: simpleBarId }}

diff --git a/packages/web/src/components/artist/UserListModal.module.css b/packages/web/src/components/artist/UserListModal.module.css
@@ -1,4 +1,22 @@
+.modalBody {
+  max-width: 360px;
+  width: 100%;
+}
+
+.modalHeader {
+  margin: 0px 16px;
+}
+
+.modalTitle {
+  color: var(--neutral-light-4);
+  font-size: var(--font-l);
+  font-weight: var(--font-heavy);
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+}
+
 .scrollable {
+  margin: 16px;
   min-height: 0;
   max-height: 690px;
   height: 100%;