DataViews: make it the root for pages and add details #57578
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -223,27 +223,69 @@ | |
|
|
||
| .dataviews-view-list { | ||
| margin: 0; | ||
| padding: $grid-unit-10; | ||
|
|
||
| li { | ||
| margin: 0; | ||
|
|
||
| .dataviews-view-list__item-wrapper { | ||
| position: relative; | ||
| padding-right: $grid-unit-30; | ||
| border-radius: $grid-unit-05; | ||
|
|
||
| &::after { | ||
| position: absolute; | ||
| content: ""; | ||
| top: 100%; | ||
| left: $grid-unit-30; | ||
| right: $grid-unit-30; | ||
| background: $gray-100; | ||
| height: 1px; | ||
| } | ||
| } | ||
|
|
||
| &:not(.is-selected):hover { | ||
| color: var(--wp-admin-theme-color); | ||
|
|
||
| .dataviews-view-list__fields { | ||
| color: var(--wp-admin-theme-color); | ||
| } | ||
| } | ||
| } | ||
|
|
||
oandregal marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| li.is-selected, | ||
| li.is-selected:focus-within { | ||
| .dataviews-view-list__item-wrapper { | ||
| background-color: var(--wp-admin-theme-color); | ||
| color: $white; | ||
|
|
||
| .dataviews-view-list__fields, | ||
| .components-button { | ||
| color: $white; | ||
| } | ||
|
|
||
| &::after { | ||
| background: transparent; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .dataviews-view-list__item { | ||
| padding: $grid-unit-15 0 $grid-unit-15 $grid-unit-30; | ||
| width: 100%; | ||
| cursor: pointer; | ||
| &:focus { | ||
| &::before { | ||
|
||
| position: absolute; | ||
| content: ""; | ||
| top: -1px; | ||
| right: -1px; | ||
| bottom: -1px; | ||
| left: -1px; | ||
| box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color); | ||
| z-index: -1; | ||
| border-radius: $grid-unit-05; | ||
| } | ||
| } | ||
| h3 { | ||
| overflow: hidden; | ||
|
|
@@ -252,22 +294,12 @@ | |
| } | ||
| } | ||
|
|
||
| .dataviews-view-list__media-wrapper { | ||
| min-width: $grid-unit-40; | ||
| height: $grid-unit-40; | ||
| border-radius: $grid-unit-05; | ||
| overflow: hidden; | ||
| position: relative; | ||
|
|
||
| &::after { | ||
| content: ""; | ||
|
|
@@ -301,6 +333,27 @@ | |
| } | ||
| } | ||
| } | ||
|
|
||
| .dataviews-view-list__details-button { | ||
| align-self: center; | ||
| opacity: 0; | ||
| } | ||
|
|
||
| li.is-selected, | ||
| li:hover, | ||
| li:focus-within { | ||
| .dataviews-view-list__details-button { | ||
| opacity: 1; | ||
| } | ||
| } | ||
|
|
||
| li.is-selected { | ||
| .dataviews-view-list__details-button { | ||
| &:focus { | ||
| box-shadow: 0 0 0 var(--wp-admin-border-width-focus) currentColor; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .dataviews-action-modal { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,15 +10,19 @@ import { useAsyncList } from '@wordpress/compose'; | |
| import { | ||
| __experimentalHStack as HStack, | ||
| __experimentalVStack as VStack, | ||
| Button, | ||
| } from '@wordpress/components'; | ||
| import { ENTER, SPACE } from '@wordpress/keycodes'; | ||
| import { info } from '@wordpress/icons'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| export default function ViewList( { | ||
| view, | ||
| fields, | ||
| data, | ||
| getItemId, | ||
| onSelectionChange, | ||
| onDetailsChange, | ||
| selection, | ||
| deferredRendering, | ||
| } ) { | ||
|
|
@@ -49,28 +53,27 @@ export default function ViewList( { | |
| <ul className="dataviews-view-list"> | ||
| { usedData.map( ( item ) => { | ||
| return ( | ||
| <li | ||
|
||
| key={ getItemId( item ) } | ||
| className={ classNames( { | ||
| 'is-selected': selection.includes( item.id ), | ||
| } ) } | ||
| > | ||
| <HStack className="dataviews-view-list__item-wrapper"> | ||
| <div | ||
| role="button" | ||
| tabIndex={ 0 } | ||
| aria-pressed={ selection.includes( item.id ) } | ||
| onKeyDown={ onEnter( item ) } | ||
| className="dataviews-view-list__item" | ||
| onClick={ () => onSelectionChange( [ item ] ) } | ||
| > | ||
| <HStack spacing={ 3 } justify="start"> | ||
| <div className="dataviews-view-list__media-wrapper"> | ||
| { mediaField?.render( { item } ) || ( | ||
| <div className="dataviews-view-list__media-placeholder"></div> | ||
| ) } | ||
| </div> | ||
| <VStack spacing={ 1 }> | ||
| { primaryField?.render( { item } ) } | ||
| <div className="dataviews-view-list__fields"> | ||
|
|
@@ -89,8 +92,19 @@ export default function ViewList( { | |
| </div> | ||
| </VStack> | ||
| </HStack> | ||
| </div> | ||
| { onDetailsChange && ( | ||
| <Button | ||
| className="dataviews-view-list__details-button" | ||
| onClick={ () => | ||
| onDetailsChange( [ item ] ) | ||
| } | ||
| icon={ info } | ||
| label={ __( 'View details' ) } | ||
| size="compact" | ||
| /> | ||
| ) } | ||
| </HStack> | ||
| </li> | ||
| ); | ||
| } ) } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there's a world where this is the same as
onSelectionChangein other words, when a single item is selected in list view we navigate to "details" and vice versaThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's possible, indeed. The way it works now is optimized for being a listing: you navigate through the items, preview them, and can manage them. There's also the multi-selection use case for bulk editing that needs to be accommodated.