From 4dd6a650bec941d60b47c157c07b2db8c20dd6d8 Mon Sep 17 00:00:00 2001 From: ronronscelestes Date: Mon, 23 May 2022 17:28:10 +0200 Subject: [PATCH] refactor FolderCardLink/FolderCardBodyAction --- .../FolderCard/FolderCardBodyAction/index.js | 25 + .../admin/src/components/FolderCard/index.js | 3 +- .../admin/src/components/FolderCard/styled.js | 7 - .../src/components/FolderList/FolderList.js | 11 +- .../__snapshots__/FolderList.test.js.snap | 518 ++++++++++-------- 5 files changed, 316 insertions(+), 248 deletions(-) create mode 100644 packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js delete mode 100644 packages/core/upload/admin/src/components/FolderCard/styled.js diff --git a/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js b/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js new file mode 100644 index 0000000000..4b86783b1a --- /dev/null +++ b/packages/core/upload/admin/src/components/FolderCard/FolderCardBodyAction/index.js @@ -0,0 +1,25 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { NavLink } from 'react-router-dom'; +import styled from 'styled-components'; + +const FolderCardLink = styled(NavLink)` + max-width: 100%; + text-decoration: none; +`; + +export const FolderCardBodyAction = ({ to, ...props }) => { + if (to) { + return ; + } + + return + + + + + @@ -535,35 +553,36 @@ exports[`FolderList does select selected folders 1`] = ` class="" > @@ -642,7 +665,7 @@ exports[`FolderList does select selected folders 1`] = `

g, -.c26 svg path { +.c30 svg > g, +.c30 svg path { fill: #ffffff; } -.c26[aria-disabled='true'] { +.c30[aria-disabled='true'] { pointer-events: none; } -.c26:after { +.c30:after { -webkit-transition-property: all; transition-property: all; -webkit-transition-duration: 0.2s; @@ -792,11 +819,11 @@ exports[`FolderList renders 1`] = ` border: 2px solid transparent; } -.c26:focus-visible { +.c30:focus-visible { outline: none; } -.c26:focus-visible:after { +.c30:focus-visible:after { border-radius: 8px; content: ''; position: absolute; @@ -807,7 +834,7 @@ exports[`FolderList renders 1`] = ` border: 2px solid #4945ff; } -.c27 { +.c31 { display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; @@ -824,26 +851,26 @@ exports[`FolderList renders 1`] = ` width: 2rem; } -.c27 svg > g, -.c27 svg path { +.c31 svg > g, +.c31 svg path { fill: #8e8ea9; } -.c27:hover svg > g, -.c27:hover svg path { +.c31:hover svg > g, +.c31:hover svg path { fill: #666687; } -.c27:active svg > g, -.c27:active svg path { +.c31:active svg > g, +.c31:active svg path { fill: #a5a5ba; } -.c27[aria-disabled='true'] { +.c31[aria-disabled='true'] { background-color: #eaeaef; } -.c27[aria-disabled='true'] svg path { +.c31[aria-disabled='true'] svg path { fill: #666687; } @@ -855,7 +882,7 @@ exports[`FolderList renders 1`] = ` line-height: 1.25; } -.c18 { +.c19 { font-weight: 500; color: #32324d; display: block; @@ -866,13 +893,13 @@ exports[`FolderList renders 1`] = ` line-height: 1.43; } -.c21 { +.c22 { color: #666687; font-size: 0.75rem; line-height: 1.33; } -.c20 { +.c21 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -884,7 +911,7 @@ exports[`FolderList renders 1`] = ` width: 1px; } -.c10 { +.c11 { margin: 0; height: 18px; min-width: 18px; @@ -895,12 +922,12 @@ exports[`FolderList renders 1`] = ` cursor: pointer; } -.c10:checked { +.c11:checked { background-color: #4945ff; border: 1px solid #4945ff; } -.c10:checked:after { +.c11:checked:after { content: ''; display: block; position: relative; @@ -914,21 +941,21 @@ exports[`FolderList renders 1`] = ` transform: translateX(-50%) translateY(-50%); } -.c10:checked:disabled:after { +.c11:checked:disabled:after { background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAiIGhlaWdodD0iOCIgdmlld0JveD0iMCAwIDEwIDgiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHBhdGgKICAgIGQ9Ik04LjU1MzIzIDAuMzk2OTczQzguNjMxMzUgMC4zMTYzNTUgOC43NjA1MSAwLjMxNTgxMSA4LjgzOTMxIDAuMzk1NzY4TDkuODYyNTYgMS40MzQwN0M5LjkzODkzIDEuNTExNTcgOS45MzkzNSAxLjYzNTkgOS44NjM0OSAxLjcxMzlMNC4wNjQwMSA3LjY3NzI0QzMuOTg1OSA3Ljc1NzU1IDMuODU3MDcgNy43NTgwNSAzLjc3ODM0IDcuNjc4MzRMMC4xMzg2NiAzLjk5MzMzQzAuMDYxNzc5OCAzLjkxNTQ5IDAuMDYxNzEwMiAzLjc5MDMyIDAuMTM4NTA0IDMuNzEyNEwxLjE2MjEzIDIuNjczNzJDMS4yNDAzOCAyLjU5NDMyIDEuMzY4NDMgMi41OTQyMiAxLjQ0NjggMi42NzM0OEwzLjkyMTc0IDUuMTc2NDdMOC41NTMyMyAwLjM5Njk3M1oiCiAgICBmaWxsPSIjOEU4RUE5IgogIC8+Cjwvc3ZnPg==) no-repeat no-repeat center center; } -.c10:disabled { +.c11:disabled { background-color: #dcdce4; border: 1px solid #c0c0cf; } -.c10:indeterminate { +.c11:indeterminate { background-color: #4945ff; border: 1px solid #4945ff; } -.c10:indeterminate:after { +.c11:indeterminate:after { content: ''; display: block; position: relative; @@ -943,16 +970,16 @@ exports[`FolderList renders 1`] = ` transform: translateX(-50%) translateY(-50%); } -.c10:indeterminate:disabled { +.c11:indeterminate:disabled { background-color: #dcdce4; border: 1px solid #c0c0cf; } -.c10:indeterminate:disabled:after { +.c11:indeterminate:disabled:after { background-color: #8e8ea9; } -.c6 { +.c7 { background: #ffffff; padding-top: 12px; padding-right: 16px; @@ -964,7 +991,7 @@ exports[`FolderList renders 1`] = ` cursor: pointer; } -.c7 { +.c8 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -978,20 +1005,20 @@ exports[`FolderList renders 1`] = ` flex-direction: row; } -.c8 > * { +.c9 > * { margin-left: 0; margin-right: 0; } -.c8 > * + * { +.c9 > * + * { margin-left: 12px; } -.c22 { +.c26 { right: 16px; } -.c23 { +.c27 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -1005,21 +1032,21 @@ exports[`FolderList renders 1`] = ` flex-direction: row; } -.c24 > * { +.c28 > * { margin-left: 0; margin-right: 0; } -.c24 > * + * { +.c28 > * + * { margin-left: 8px; } -.c25 { +.c29 { position: absolute; top: 12px; } -.c5 { +.c6 { height: 100%; left: 0; position: absolute; @@ -1028,30 +1055,39 @@ exports[`FolderList renders 1`] = ` width: 100%; } -.c5:hover, -.c5:focus { +.c6:hover, +.c6:focus { -webkit-text-decoration: none; text-decoration: none; } -.c12 path { +.c13 path { fill: currentColor; } -.c15 { +.c25 { + display: none; +} + +.c5:hover .c23, +.c5:focus-within .c23 { + display: block; +} + +.c16 { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; } -.c16 { +.c17 { max-width: 100%; -webkit-text-decoration: none; text-decoration: none; } -.c19 { +.c20 { max-width: 100%; } @@ -1090,34 +1126,35 @@ exports[`FolderList renders 1`] = ` class="" >

@@ -1200,34 +1241,35 @@ exports[`FolderList renders 1`] = ` class="" > @@ -1306,7 +1352,7 @@ exports[`FolderList renders 1`] = `