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

WP 6.3 compatibility fixes #190

Merged
merged 4 commits into from
Oct 1, 2023
Merged

WP 6.3 compatibility fixes #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9abccab
simplified post featured image controls
nk-o Oct 1, 2023
29c39e3
simplified webpack config
nk-o Oct 1, 2023
438b775
fixed FSE editor JS error
nk-o Oct 1, 2023
a031dfb
Requires at least: 6.2
nk-o Oct 1, 2023
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
15 changes: 5 additions & 10 deletions assets/admin/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,19 +270,14 @@ $escaped-svg-characters: (
* Post featured image focal point meta.
*/
.vpf-post-image-focal-point-panel {
.components-focal-point-picker_position-display-container {
.components-base-control__label {
max-width: 100%;
}
margin-top: 20px;

.components-base-control {
margin-bottom: 0;
}
> .components-panel__row {
gap: 15px;
}

// hide default image preview.
~ .editor-post-featured-image .editor-post-featured-image__preview {
display: none;
.components-input-control {
flex: 1;
}
}

Expand Down
6 changes: 6 additions & 0 deletions classes/class-preview.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public function init_hooks() {
add_action( 'template_redirect', array( $this, 'template_redirect' ) );
add_action( 'wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 11 );

// Localize script in editor, FSE, and Elementor.
add_action( 'enqueue_block_assets', array( $this, 'localize_scripts' ), 9 );
add_action( 'wp_print_scripts', array( $this, 'localize_scripts' ), 9 );
}

Expand Down Expand Up @@ -82,6 +84,10 @@ public function get_preview_url() {
* Localize scripts with preview URL.
*/
public function localize_scripts() {
if ( ! is_admin() ) {
return;
}

$preview_url = $this->get_preview_url();

// Localize scripts.
Expand Down
96 changes: 41 additions & 55 deletions gutenberg/custom-post-meta/image-focal-point.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,63 +9,33 @@ import { withSelect, withDispatch } from '@wordpress/data';

import { Component } from '@wordpress/element';

import { PanelRow, FocalPointPicker } from '@wordpress/components';

import { addFilter } from '@wordpress/hooks';

import {
PanelRow,
UnitControl as __stableUnitControl,
__experimentalUnitControl,
} from '@wordpress/components';

const UnitControl = __stableUnitControl || __experimentalUnitControl;

/**
* Component
*/
class VpImageFocalPointComponent extends Component {
render() {
const { getMeta, thumbnailData, updateMeta } = this.props;

let previewUrl = '';

if (thumbnailData) {
const mediaSize = 'post-thumbnail';

previewUrl = thumbnailData.source_url;

if (
!thumbnailData.mime_type ||
thumbnailData.mime_type !== 'image/gif'
) {
if (
thumbnailData.media_details &&
thumbnailData.media_details.sizes &&
thumbnailData.media_details.sizes[mediaSize]
) {
// use mediaSize when available
previewUrl =
thumbnailData.media_details.sizes[mediaSize].source_url;
} else {
// get fallbackMediaSize if mediaSize is not available
const fallbackMediaSize = 'thumbnail';

if (
thumbnailData.media_details &&
thumbnailData.media_details.sizes &&
thumbnailData.media_details.sizes[fallbackMediaSize]
) {
// use fallbackMediaSize when mediaSize is not available
previewUrl =
thumbnailData.media_details.sizes[fallbackMediaSize]
.source_url;
}
}
}
}
const { getMeta, featuredImageId, updateMeta } = this.props;

if (!previewUrl) {
if (!featuredImageId) {
return null;
}

let focalPoint = getMeta('_vp_image_focal_point');

if (!focalPoint || !focalPoint.x || !focalPoint.y) {
focalPoint = {
x: '0.5',
y: '0.5',
x: 0.5,
y: 0.5,
};
}

Expand All @@ -74,18 +44,39 @@ class VpImageFocalPointComponent extends Component {
<PanelRow>
<p className="description">
{__(
'Focal point will be used in Visual Portfolio layouts only.',
'Focal point will be used in Visual Portfolio layouts only:',
'visual-portfolio'
)}
</p>
</PanelRow>
<PanelRow>
<FocalPointPicker
url={previewUrl}
value={focalPoint}
<UnitControl
label={__('Left', 'visual-portfolio')}
value={100 * focalPoint.x + '%'}
onChange={(val) => {
updateMeta('_vp_image_focal_point', val);
const newFocalPoint = { ...focalPoint };
newFocalPoint.x = parseFloat(val) / 100;

updateMeta('_vp_image_focal_point', newFocalPoint);
}}
min={0}
max={100}
step={1}
units={[{ value: '%', label: '%' }]}
/>
<UnitControl
label={__('Top', 'visual-portfolio')}
value={100 * focalPoint.y + '%'}
onChange={(val) => {
const newFocalPoint = { ...focalPoint };
newFocalPoint.y = parseFloat(val) / 100;

updateMeta('_vp_image_focal_point', newFocalPoint);
}}
min={0}
max={100}
step={1}
units={[{ value: '%', label: '%' }]}
/>
</PanelRow>
</div>
Expand All @@ -97,16 +88,11 @@ const VpImageFocalPoint = compose([
withSelect((select) => {
const { getEditedPostAttribute } = select('core/editor');

const { getMedia } = select('core');

const featuredImageId = getEditedPostAttribute('featured_media');
const meta = getEditedPostAttribute('meta') || {};
const thumbnailData = featuredImageId
? getMedia(featuredImageId)
: null;

return {
thumbnailData,
featuredImageId,
getMeta(name) {
return meta[name];
},
Expand All @@ -127,8 +113,8 @@ addFilter(
function (props) {
return (
<>
<VpImageFocalPoint />
<OriginalComponent {...props} />
<VpImageFocalPoint />
</>
);
}
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Contributors: nko
* Tags: portfolio, gallery, photo gallery, image gallery, wordpress gallery plugin
* Donate link: https://visualportfolio.co/?utm_source=wordpress.org&utm_medium=readme&utm_campaign=donate
* Requires at least: 6.0
* Requires at least: 6.2
* Tested up to: 6.3
* Requires PHP: 7.2
* Stable tag: 3.1.3
Expand Down
19 changes: 9 additions & 10 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,16 @@ const entryAssetsCss = glob

const newConfig = {
...defaultConfig,
...{
entry: {
// Assets JS.
...entryAssetsJs,
// Assets CSS.
...entryAssetsCss,
},

// Display minimum info in terminal.
stats: 'minimal',
entry: {
// Assets JS.
...entryAssetsJs,
// Assets CSS.
...entryAssetsCss,
},

// Display minimum info in terminal.
stats: 'minimal',

module: {
...defaultConfig.module,
rules: [...defaultConfig.module.rules],
Expand Down
Loading