Merge branch 'master' into fix/lw-collection-and-item-loader

decentraland · Oct 3, 2024 · a82d72c · a82d72c
2 parents c752943 + 73ab2d0
commit a82d72c
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 115 deletions.
diff --git a/src/components/LinkedToTooltip/LinkedToToolip.types.ts b/src/components/LinkedToTooltip/LinkedToToolip.types.ts
@@ -0,0 +1,3 @@
+export type Props = {
+  className?: string
+}
diff --git a/src/components/LinkedToTooltip/LinkedToTooltip.module.css b/src/components/LinkedToTooltip/LinkedToTooltip.module.css
@@ -0,0 +1,64 @@
+.linkedTooltip {
+  display: grid;
+  width: 458px;
+  margin: 14px;
+  grid-template-columns: auto auto;
+  gap: 4px;
+  overflow: hidden;
+}
+
+.gridItem {
+  position: relative;
+  padding: 10px;
+  display: flex;
+  align-items: start;
+}
+
+.mappingExample {
+  color: #cfcdd4;
+}
+
+.mappingType {
+  display: flex;
+  align-items: center;
+}
+
+.mappingDescription {
+  flex-direction: column;
+}
+
+.mappingIcon {
+  width: 20px;
+  height: 20px;
+  margin-right: 10px;
+}
+
+.tooltipHeader {
+  display: flex;
+  align-items: center;
+  grid-column-start: 1;
+  grid-column-end: 3;
+  padding: 10px;
+  text-transform: uppercase;
+}
+
+.tooltipHeader img {
+  width: 20px;
+  height: 20px;
+  margin-right: 10px;
+}
+
+.gridItem::before,
+.gridItem::after {
+  content: '';
+  position: absolute;
+  background-color: #a09ba8;
+  z-index: 1;
+}
+
+.gridItem::after {
+  width: 100vw;
+  height: 1px;
+  left: 0;
+  top: -1px;
+}
diff --git a/src/components/LinkedToTooltip/LinkedToTooltip.tsx b/src/components/LinkedToTooltip/LinkedToTooltip.tsx
@@ -0,0 +1,50 @@
+import classNames from 'classnames'
+import { InfoTooltip } from 'decentraland-ui'
+import { t } from 'decentraland-dapps/dist/modules/translation'
+import { MappingType } from '@dcl/schemas'
+import allIcon from '../../icons/all.svg'
+import multipleIcon from '../../icons/multiple.svg'
+import singleIcon from '../../icons/single.svg'
+import rangeIcon from '../../icons/range.svg'
+import lightbulbIcon from '../../icons/lightbulb.svg'
+import styles from './LinkedToTooltip.module.css'
+import { Props } from './LinkedToToolip.types'
+
+const mappingTypeIcons = {
+  [MappingType.ANY]: allIcon,
+  [MappingType.MULTIPLE]: multipleIcon,
+  [MappingType.SINGLE]: singleIcon,
+  [MappingType.RANGE]: rangeIcon
+}
+
+const LinkingTooltipMappingType = ({ type }: { type: MappingType }) => {
+  return (
+    <>
+      <div className={styles.gridItem}>
+        <div className={styles.mappingType}>
+          <img className={styles.mappingIcon} src={mappingTypeIcons[type]} />
+          {t(`mapping_editor.mapping_types.${type}`)}
+        </div>
+      </div>
+      <div className={classNames(styles.gridItem, styles.mappingDescription)}>
+        <div>{t(`mapping_editor.mapping_descriptions.${type}`)}</div>
+        {type !== MappingType.ANY && <div className={styles.mappingExample}>{t(`mapping_editor.mapping_examples.${type}`)}</div>}
+      </div>
+    </>
+  )
+}
+
+export const LinkingToTooltip = ({ className }: Props) => (
+  <InfoTooltip className={className}>
+    <div className={styles.linkedTooltip}>
+      <div className={styles.tooltipHeader}>
+        <img src={lightbulbIcon} />
+        {t('collection_row.linking_tooltip.title')}
+      </div>
+      <LinkingTooltipMappingType type={MappingType.ANY} />
+      <LinkingTooltipMappingType type={MappingType.SINGLE} />
+      <LinkingTooltipMappingType type={MappingType.MULTIPLE} />
+      <LinkingTooltipMappingType type={MappingType.RANGE} />
+    </div>
+  </InfoTooltip>
+)
diff --git a/src/components/LinkedToTooltip/index.ts b/src/components/LinkedToTooltip/index.ts
@@ -0,0 +1 @@
+export * from './LinkedToTooltip'
diff --git a/src/components/MappingEditor/MappingEditor.module.css b/src/components/MappingEditor/MappingEditor.module.css
@@ -127,3 +127,11 @@
 .mappings :global(.dcl.text-area) {
   width: 100%;
 }
+
+/* Tooltip */
+
+.typeLabel {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
diff --git a/src/components/MappingEditor/MappingEditor.tsx b/src/components/MappingEditor/MappingEditor.tsx
@@ -3,6 +3,7 @@ import classNames from 'classnames'
 import { DropdownProps, Field, InputOnChangeData, SelectField, TextAreaField, TextAreaProps } from 'decentraland-ui'
 import { MappingType, MultipleMapping } from '@dcl/schemas'
 import { t } from 'decentraland-dapps/dist/modules/translation'
+import { LinkingToTooltip } from 'components/LinkedToTooltip'
 import allIcon from '../../icons/all.svg'
 import multipleIcon from '../../icons/multiple.svg'
 import singleIcon from '../../icons/single.svg'
@@ -117,7 +118,13 @@ export const MappingEditor = (props: Props) => {
   return (
     <div className={classNames(styles.main, isCompact ? styles.compact : styles.full)}>
       <SelectField
-        label={isCompact ? undefined : t('mapping_editor.mapping_type_label')}
+        label={
+          isCompact ? undefined : (
+            <div className={styles.typeLabel}>
+              {t('mapping_editor.mapping_type_label')} <LinkingToTooltip />
+            </div>
+          )
+        }
         onChange={handleMappingTypeChange}
         placeholder={t('mapping_editor.mapping_type_placeholder')}
         value={mappingType}

diff --git a/src/components/Modals/CreateSingleItemModal/CreateSingleItemModal.css b/src/components/Modals/CreateSingleItemModal/CreateSingleItemModal.css
@@ -3,6 +3,10 @@
   visibility: hidden !important;
 }
 
+.CreateSingleItemModalContainer > .ui.page.modals {
+  z-index: 1900;
+}
+
 .CreateSingleItemModal.ui.modal > .content {
   margin-bottom: 32px;
 }

diff --git a/...s/ThirdPartyCollectionDetailPage/CollectionItemHeaderV2/CollectionItemHeaderV2.module.css b/...s/ThirdPartyCollectionDetailPage/CollectionItemHeaderV2/CollectionItemHeaderV2.module.css
@@ -17,71 +17,6 @@
   margin-right: 10px;
 }
 
-.linkedTooltip {
-  display: grid;
-  width: 458px;
-  margin: 14px;
-  grid-template-columns: auto auto;
-  gap: 4px;
-  overflow: hidden;
-}
-
-.gridItem {
-  position: relative;
-  padding: 10px;
-  display: flex;
-  align-items: start;
-}
-
-.mappingExample {
-  color: #cfcdd4;
-}
-
-.mappingType {
-  display: flex;
-  align-items: center;
-}
-
-.mappingDescription {
-  flex-direction: column;
-}
-
-.mappingIcon {
-  width: 20px;
-  height: 20px;
-  margin-right: 10px;
-}
-
-.tooltipHeader {
-  display: flex;
-  align-items: center;
-  grid-column-start: 1;
-  grid-column-end: 3;
-  padding: 10px;
-  text-transform: uppercase;
-}
-
-.tooltipHeader img {
-  width: 20px;
-  height: 20px;
-  margin-right: 10px;
-}
-
-.gridItem::before,
-.gridItem::after {
-  content: '';
-  position: absolute;
-  background-color: #a09ba8;
-  z-index: 1;
-}
-
-.gridItem::after {
-  width: 100vw;
-  height: 1px;
-  left: 0;
-  top: -1px;
-}
-
 .linkedToColumn > span {
   margin-right: 6px;
 }
diff --git a/...mponents/ThirdPartyCollectionDetailPage/CollectionItemHeaderV2/CollectionItemHeaderV2.tsx b/...mponents/ThirdPartyCollectionDetailPage/CollectionItemHeaderV2/CollectionItemHeaderV2.tsx
@@ -1,52 +1,9 @@
-import classNames from 'classnames'
-import { MappingType } from '@dcl/schemas'
-import { Checkbox, Grid, InfoTooltip } from 'decentraland-ui'
-import allIcon from '../../../icons/all.svg'
-import multipleIcon from '../../../icons/multiple.svg'
-import singleIcon from '../../../icons/single.svg'
-import rangeIcon from '../../../icons/range.svg'
-import lightbulbIcon from '../../../icons/lightbulb.svg'
-import { Props } from './CollectionItemHeaderV2.types'
+import { Checkbox, Grid } from 'decentraland-ui'
 import { t } from 'decentraland-dapps/dist/modules/translation'
+import { LinkingToTooltip } from 'components/LinkedToTooltip'
+import { Props } from './CollectionItemHeaderV2.types'
 import styles from './CollectionItemHeaderV2.module.css'
 
-const mappingTypeIcons = {
-  [MappingType.ANY]: allIcon,
-  [MappingType.MULTIPLE]: multipleIcon,
-  [MappingType.SINGLE]: singleIcon,
-  [MappingType.RANGE]: rangeIcon
-}
-
-const LinkingTooltipMappingType = ({ type }: { type: MappingType }) => {
-  return (
-    <>
-      <div className={styles.gridItem}>
-        <div className={styles.mappingType}>
-          <img className={styles.mappingIcon} src={mappingTypeIcons[type]} />
-          {t(`mapping_editor.mapping_types.${type}`)}
-        </div>
-      </div>
-      <div className={classNames(styles.gridItem, styles.mappingDescription)}>
-        <div>{t(`mapping_editor.mapping_descriptions.${type}`)}</div>
-        {type !== MappingType.ANY && <div className={styles.mappingExample}>{t(`mapping_editor.mapping_examples.${type}`)}</div>}
-      </div>
-    </>
-  )
-}
-
-const LinkingTooltipContent = () => (
-  <div className={styles.linkedTooltip}>
-    <div className={styles.tooltipHeader}>
-      <img src={lightbulbIcon} />
-      {t('collection_row.linking_tooltip.title')}
-    </div>
-    <LinkingTooltipMappingType type={MappingType.ANY} />
-    <LinkingTooltipMappingType type={MappingType.SINGLE} />
-    <LinkingTooltipMappingType type={MappingType.MULTIPLE} />
-    <LinkingTooltipMappingType type={MappingType.RANGE} />
-  </div>
-)
-
 export const CollectionItemHeaderV2 = ({ areAllSelected, onSelectedAllClick }: Props) => {
   return (
     <Grid columns="equal" className={styles.gridHeader}>
@@ -58,9 +15,7 @@ export const CollectionItemHeaderV2 = ({ areAllSelected, onSelectedAllClick }: P
         </Grid.Column>
         <Grid.Column className={styles.linkedToColumn}>
           <span>{t('third_party_collection_detail_page.linked_to')}</span>
-          <InfoTooltip>
-            <LinkingTooltipContent />
-          </InfoTooltip>
+          <LinkingToTooltip />
         </Grid.Column>
         <Grid.Column width={3}> {t('collection_row.status')} </Grid.Column>
         <Grid.Column width={1}></Grid.Column>