Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FontCollection: Update pagination controls #67143

Merged
merged 1 commit into from
Nov 28, 2024
Merged

FontCollection: Update pagination controls #67143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 40 additions & 27 deletions packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ import {
} from '@wordpress/components';
import { debounce } from '@wordpress/compose';
import { sprintf, __, _x, isRTL } from '@wordpress/i18n';
import { moreVertical, chevronLeft, chevronRight } from '@wordpress/icons';
import {
moreVertical,
next,
previous,
chevronLeft,
chevronRight,
} from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -486,37 +492,30 @@ function FontCollection( { slug } ) {

{ ! selectedFont && (
<HStack
spacing={ 4 }
justify="center"
expanded={ false }
className="font-library-modal__footer"
justify="end"
spacing={ 6 }
>
<Button
label={ __( 'Previous page' ) }
size="compact"
onClick={ () => setPage( page - 1 ) }
disabled={ page === 1 }
showTooltip
accessibleWhenDisabled
icon={ isRTL() ? chevronRight : chevronLeft }
tooltipPosition="top"
/>
<HStack
justify="flex-start"
expanded={ false }
spacing={ 2 }
spacing={ 1 }
className="font-library-modal__page-selection"
>
{ createInterpolateElement(
sprintf(
// translators: %s: Total number of pages.
// translators: 1: Current page number, 2: Total number of pages.
_x(
'Page <CurrentPageControl /> of %s',
'<div>Page</div>%1$s<div>of %2$s</div>',
'paging'
),
'<CurrentPage />',
totalPages
),
{
CurrentPageControl: (
div: <div aria-hidden />,
CurrentPage: (
<SelectControl
aria-label={ __(
'Current page'
Expand All @@ -535,22 +534,36 @@ function FontCollection( { slug } ) {
parseInt( newPage )
)
}
size="compact"
size="small"
__nextHasNoMarginBottom
variant="minimal"
/>
),
}
) }
</HStack>
<Button
label={ __( 'Next page' ) }
size="compact"
onClick={ () => setPage( page + 1 ) }
disabled={ page === totalPages }
accessibleWhenDisabled
icon={ isRTL() ? chevronLeft : chevronRight }
tooltipPosition="top"
/>
<HStack expanded={ false } spacing={ 1 }>
<Button
onClick={ () => setPage( page - 1 ) }
disabled={ page === 1 }
accessibleWhenDisabled
label={ __( 'Previous page' ) }
icon={ isRTL() ? next : previous }
showTooltip
size="compact"
tooltipPosition="top"
/>
<Button
onClick={ () => setPage( page + 1 ) }
disabled={ page === totalPages }
accessibleWhenDisabled
label={ __( 'Next page' ) }
icon={ isRTL() ? previous : next }
showTooltip
size="compact"
tooltipPosition="top"
/>
</HStack>
</HStack>
) }
</>
Expand Down
17 changes: 12 additions & 5 deletions packages/edit-site/src/components/global-styles/font-library-modal/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,15 @@ $footer-height: 70px;

.font-library-modal__page-selection {
font-size: 11px;
text-transform: uppercase;
font-weight: 500;
color: $gray-900;
text-transform: uppercase;

@include break-small() {
.components-select-control__input {
font-size: 11px !important;
font-weight: 500;
}
}
}

// TODO: See if this can be removed after https://github.com/WordPress/gutenberg/issues/38730
Expand Down Expand Up @@ -124,7 +130,7 @@ $footer-height: 70px;
white-space: nowrap;
flex-shrink: 0;
transition: opacity 0.3s ease-in-out;
@include reduce-motion("transition");
@include reduce-motion( "transition" );
}
}

Expand All @@ -147,7 +153,6 @@ $footer-height: 70px;
}
}


.font-library-modal__upload-area {
align-items: center;
display: flex;
Expand Down Expand Up @@ -200,7 +205,9 @@ button.font-library-modal__upload-area {
}

.font-library-modal__select-all {
padding: $grid-unit-20 $grid-unit-20 $grid-unit-20 $grid-unit-20 + $border-width;
padding:
$grid-unit-20 $grid-unit-20 $grid-unit-20 $grid-unit-20 +
$border-width;

.components-checkbox-control__label {
padding-left: $grid-unit-20;
Expand Down
Loading