Skip to content
This repository was archived by the owner on Jan 4, 2022. It is now read-only.

Commit 3e355d7

Browse files
HardeepAsraniHardeepAsrani
authored
Merge pull request #256 from HardeepAsrani/development
Version 1.5.0
2 parents fbf5395 + dc78246 commit 3e355d7

File tree

29 files changed

+1305
-1254
lines changed

29 files changed

+1305
-1254
lines changed

‎build/blocks.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/chunk-1.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/chunk-vendor.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/editor.css‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/maps.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/slider.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎inc/css/class-css-handler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ public function compress( $css ) {
282282
$compressor->setPcreBacktrackLimit( 3000000 );
283283
$compressor->setPcreRecursionLimit( 150000 );
284284

285-
$css = $compressor->run( $css );
286285
$css = htmlspecialchars_decode( $css );
286+
$css = $compressor->run( $css );
287287

288288
return $css;
289289
}

‎src/blocks/advanced-heading/edit.js‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ const { createBlock } = wp.blocks;
1616

1717
const { RichText } = wp.blockEditor;
1818

19+
const { compose } = wp.compose;
20+
21+
const { withSelect } = wp.data;
22+
1923
const {
2024
Fragment,
2125
useEffect
@@ -45,7 +49,11 @@ const Edit = ({
4549
isLarger,
4650
isLarge,
4751
isSmall,
48-
isSmaller
52+
isSmaller,
53+
isViewportAvailable,
54+
isPreviewDesktop,
55+
isPreviewTablet,
56+
isPreviewMobile
4957
}) => {
5058
useEffect( () => {
5159
initBlock();
@@ -91,11 +99,17 @@ const Edit = ({
9199
window.themeisleGutenberg.blockIDs = [ ...blockIDs ];
92100
};
93101

94-
const isDesktop = ( isLarger && ! isLarge && isSmall && ! isSmaller );
102+
let isDesktop = isLarger && ! isLarge && isSmall && ! isSmaller;
95103

96-
const isTablet = ( ! isLarger && ! isLarge && isSmall && ! isSmaller );
104+
let isTablet = ! isLarger && ! isLarge && isSmall && ! isSmaller;
97105

98-
const isMobile = ( ! isLarger && ! isLarge && ! isSmall && ! isSmaller );
106+
let isMobile = ! isLarger && ! isLarge && ! isSmall && ! isSmaller;
107+
108+
if ( isViewportAvailable && ! isMobile ) {
109+
isDesktop = isPreviewDesktop;
110+
isTablet = isPreviewTablet;
111+
isMobile = isPreviewMobile;
112+
}
99113

100114
const changeContent = value => {
101115
setAttributes({ content: value });
@@ -274,9 +288,22 @@ const Edit = ({
274288
);
275289
};
276290

277-
export default withViewportMatch({
278-
isLarger: '>= large',
279-
isLarge: '<= large',
280-
isSmall: '>= small',
281-
isSmaller: '<= small'
282-
})( Edit );
291+
export default compose(
292+
withViewportMatch({
293+
isLarger: '>= large',
294+
isLarge: '<= large',
295+
isSmall: '>= small',
296+
isSmaller: '<= small'
297+
}),
298+
299+
withSelect( ( select ) => {
300+
const { __experimentalGetPreviewDeviceType } = select( 'core/edit-post' );
301+
302+
return {
303+
isViewportAvailable: __experimentalGetPreviewDeviceType ? true : false,
304+
isPreviewDesktop: __experimentalGetPreviewDeviceType ? 'Desktop' === __experimentalGetPreviewDeviceType() : false,
305+
isPreviewTablet: __experimentalGetPreviewDeviceType ? 'Tablet' === __experimentalGetPreviewDeviceType() : false,
306+
isPreviewMobile: __experimentalGetPreviewDeviceType ? 'Mobile' === __experimentalGetPreviewDeviceType() : false
307+
};
308+
})
309+
)( Edit );

0 commit comments

Comments
 (0)