-
+
{itemLabel()}
@@ -122,6 +148,10 @@ RepeaterItem.propTypes = {
onToggle: PropTypes.func.isRequired,
onContentChange: PropTypes.func.isRequired,
onRemove: PropTypes.func.isRequired,
+ totalItems: PropTypes.number.isRequired,
+ onMove: PropTypes.func.isRequired,
+ isKeyboardActive: PropTypes.bool.isRequired,
+ onKeyboardActiveChange: PropTypes.func.isRequired,
};
export default RepeaterItem;
diff --git a/assets/apps/customizer-controls/src/scss/_customizer-search.scss b/assets/apps/customizer-controls/src/scss/_customizer-search.scss
index f0af3805c9..35e01d914f 100644
--- a/assets/apps/customizer-controls/src/scss/_customizer-search.scss
+++ b/assets/apps/customizer-controls/src/scss/_customizer-search.scss
@@ -1,27 +1,10 @@
#neve-customize-search {
- position: absolute;
- top: 40px;
- right: 0;
- width: 40px;
- height: 28px;
- overflow: hidden;
- z-index: 1000;
-
- button {
- text-decoration: none;
- &:focus:not(:disabled) {
- box-shadow: none;
- outline: none;
- }
- }
+ display: none;
}
#neve-customize-search-field {
- display: none;
- &.visible {
- display: block;
- }
+ display: block;
.accordion-section {
background-color: #fff;
@@ -37,7 +20,6 @@
.nv-search-wrap {
display: flex;
align-items: center;
- margin-top: 6px;
}
.nv-customizer-search-input {
diff --git a/assets/apps/customizer-controls/src/scss/_general.scss b/assets/apps/customizer-controls/src/scss/_general.scss
index a6fca330ef..cb506ae541 100644
--- a/assets/apps/customizer-controls/src/scss/_general.scss
+++ b/assets/apps/customizer-controls/src/scss/_general.scss
@@ -86,9 +86,12 @@
#customize-control-neve_pro_global_header_settings_main_shortcut p,
#customize-control-neve_pro_global_header_settings_bottom_shortcut p {
margin: 0;
+ background-color: #fff;
+ padding: 10px;
a {
cursor: pointer;
+ color: #007cba;
}
}
@@ -157,3 +160,42 @@
width: 100%;
}
}
+
+// Style Book button styles
+#customize-header-actions {
+ #neve-style-book {
+ display: block;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 48px;
+ width: 45px;
+ margin-top: 0 !important;
+ padding: 0;
+ background: #f0f0f1;
+ border: none;
+ border-radius: 0;
+ border-top: 4px solid #f0f0f1;
+ border-right: 1px solid #dcdcde;
+ color: #3c434a;
+ fill: #3c434a;
+ stroke: #3c434a;
+ text-align: center;
+ cursor: pointer;
+ transition: color 0.15s ease-in-out, border-color 0.15s ease-in-out, background 0.15s ease-in-out;
+
+ .dashicons {
+ font-size: 22px;
+ line-height: 1.2;
+ width: 22px;
+ height: 22px;
+ }
+
+ &:hover,
+ &:focus {
+ color: #0073aa;
+ border-top-color: #0073aa;
+ background: #fff;
+ }
+ }
+}
diff --git a/assets/apps/customizer-controls/src/scss/_ordering.scss b/assets/apps/customizer-controls/src/scss/_ordering.scss
index 1031f0d803..c02d0062fa 100644
--- a/assets/apps/customizer-controls/src/scss/_ordering.scss
+++ b/assets/apps/customizer-controls/src/scss/_ordering.scss
@@ -58,6 +58,16 @@ $icon-bright: #00a0d2;
fill: $gray-dark;
background-color: $gray-light;
}
+
+ &:focus {
+ outline: 2px solid $icon;
+ outline-offset: -2px;
+ }
+
+ &.keyboard-active {
+ background-color: $icon-bright;
+ fill: #fff;
+ }
}
diff --git a/assets/apps/customizer-controls/src/scss/_repeater.scss b/assets/apps/customizer-controls/src/scss/_repeater.scss
index 57c74436db..c229bbb733 100644
--- a/assets/apps/customizer-controls/src/scss/_repeater.scss
+++ b/assets/apps/customizer-controls/src/scss/_repeater.scss
@@ -17,6 +17,18 @@ $text-color: #50575e;
margin: 0;
}
+ .handle {
+ &:focus {
+ outline: 2px solid #0073aa;
+ outline-offset: -2px;
+ }
+
+ &.keyboard-active {
+ background-color: #00a0d2;
+ fill: #fff;
+ }
+ }
+
.icon-control {
height: 30px;
margin-bottom: 10px;
diff --git a/assets/apps/customizer-controls/src/typography-extra/LocalGoogleFonts.js b/assets/apps/customizer-controls/src/typography-extra/LocalGoogleFonts.js
index ac499ecadd..7f6ba54fcd 100644
--- a/assets/apps/customizer-controls/src/typography-extra/LocalGoogleFonts.js
+++ b/assets/apps/customizer-controls/src/typography-extra/LocalGoogleFonts.js
@@ -20,7 +20,7 @@ const initLocalGoogleFonts = () => {
return;
}
- const toggleControl =
+ const localFontsToggle =
new wp.customize.controlConstructor.neve_toggle_control(
NeveReactCustomize.localGoogleFonts.key,
{
@@ -32,7 +32,24 @@ const initLocalGoogleFonts = () => {
}
);
- render(
, section.container[0]);
+ const preloadFontsToggle =
+ new wp.customize.controlConstructor.neve_toggle_control(
+ NeveReactCustomize.preloadFonts.key,
+ {
+ section: section.id,
+ label: __('Preload fonts', 'neve'),
+ setting: NeveReactCustomize.preloadFonts.key,
+ priority: 6,
+ }
+ );
+
+ render(
+ <>
+
+
+ ,
+ section.container[0]
+ );
};
export { initLocalGoogleFonts };
diff --git a/assets/apps/dashboard/src/Components/App.js b/assets/apps/dashboard/src/Components/App.js
index c533454b7e..74734e0323 100644
--- a/assets/apps/dashboard/src/Components/App.js
+++ b/assets/apps/dashboard/src/Components/App.js
@@ -45,7 +45,9 @@ const App = () => {
{tabs[currentTab].render(setTab)}
- {!['starter-sites', 'settings'].includes(currentTab) && (
+ {!['starter-sites', 'settings', 'launch-progress'].includes(
+ currentTab
+ ) && (
diff --git a/assets/apps/dashboard/src/Components/Content/AvailableModule.js b/assets/apps/dashboard/src/Components/Content/AvailableModule.js
new file mode 100644
index 0000000000..06a3fc262a
--- /dev/null
+++ b/assets/apps/dashboard/src/Components/Content/AvailableModule.js
@@ -0,0 +1,213 @@
+/* global neveDash */
+import { __ } from '@wordpress/i18n';
+import {
+ NEVE_AVAILABLE_MODULES_ICON_MAP,
+ NEVE_STORE,
+} from '../../utils/constants';
+import { ArrowRight, LoaderCircle, LucideSettings } from 'lucide-react';
+import Card from '../../Layout/Card';
+import { useState } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import Toggle from '../Common/Toggle';
+import { send } from '../../utils/rest';
+
+const Toast = ({ message }) => {
+ return (
+
+ {message}
+
+ );
+};
+
+const ModuleToggle = ({
+ slug,
+ moduleData,
+ setMessage,
+ isActive,
+ setIsActive,
+ isInstalled,
+ setIsInstalled,
+}) => {
+ const [loading, setLoading] = useState(false);
+ const { changeModuleStatus, setObfxModuleStatus, setToast } =
+ useDispatch(NEVE_STORE);
+ const { moduleStatus } = useSelect((select) => {
+ const { getObfxModuleStatus } = select(NEVE_STORE);
+
+ return {
+ moduleStatus: getObfxModuleStatus(slug) || false,
+ };
+ });
+
+ const { api } = neveDash;
+ const { title } = moduleData;
+ const toastMessage = {
+ installing: __('Installing', 'neve'),
+ activating: __('Activating', 'neve'),
+ };
+
+ const handleToggle = async (value) => {
+ try {
+ setLoading(true);
+ changeModuleStatus(slug, value);
+
+ let isPluginActive = true;
+ // Handle plugin installation or activation
+ if (!isInstalled) {
+ setMessage(toastMessage.installing);
+ isPluginActive = false;
+ } else if (!isActive) {
+ setMessage(toastMessage.activating);
+ isPluginActive = false;
+ }
+
+ if (!isPluginActive) {
+ await send(api + 'activate-plugin', {
+ slug: 'themeisle-companion',
+ }).then((res) => {
+ if (res.success) {
+ setIsInstalled(true);
+ setIsActive(true);
+ }
+ });
+ }
+
+ // Fire the send method after install/activate or immediately if both are done
+ const response = await send(api + 'activate-module', {
+ slug,
+ value,
+ });
+
+ setObfxModuleStatus(slug, response.success ? value : !value);
+ setToast(
+ response.success
+ ? (value
+ ? __('Module Activated', 'neve')
+ : __('Module Deactivated.', 'neve')) + ` (${title})`
+ : response.data
+ );
+ } catch (error) {
+ setToast(
+ __(
+ 'Something went wrong. Please reload the page and try again.',
+ 'neve'
+ )
+ );
+ } finally {
+ setLoading(false);
+ setMessage('');
+ }
+ };
+
+ return (
+
+
+ );
+};
+
+const AvailableModuleCard = ({
+ moduleData,
+ slug,
+ setMessage,
+ isActive,
+ setIsActive,
+ isInstalled,
+ setIsInstalled,
+}) => {
+ const { title, description } = moduleData;
+ const CardIcon = NEVE_AVAILABLE_MODULES_ICON_MAP[slug] || LucideSettings;
+
+ return (
+
+ {description}
+
+ {!isActive ? (
+
+ {__(
+ 'This feature is part of OrbitFox plugin, built by the Neve team. Enabling the toggle will automatically install and activate the plugin.',
+ 'neve'
+ )}
+
+ ) : (
+
+ {__('Settings', 'neve')}
+
+ )}
+
+ );
+};
+
+export default () => {
+ const [message, setMessage] = useState('');
+ const [isInstalled, setIsInstalled] = useState(
+ neveDash.orbitFox.isInstalled
+ );
+ const [isActive, setIsActive] = useState(neveDash.orbitFox.isActive);
+
+ return (
+ <>
+
+
+
+ {__('Available Modules', 'neve')}
+
+
+
+ {Object.entries(neveDash.availableModules).map(
+ ([slug, moduleData]) => (
+
+ )
+ )}
+
+
+
-
-
- {__('Need help deciding?', 'neve')}
-
-
-
- {__(
- 'Our support team is happy to answer your questions about specific Pro features and help you determine if they match your needs.',
- 'neve'
- )}
-
-
-
- {__(
- 'Average response time: ~8 hours during business days',
- 'neve'
- )}
-
-
-
-
-
- {__('View Pro Plans', 'neve')}
-
-
- {__('Contact Support', 'neve')}
-
-
-
- );
-};
-
export default () => {
return (
-
-
);
};
diff --git a/assets/apps/dashboard/src/Components/Content/LaunchProgress.js b/assets/apps/dashboard/src/Components/Content/LaunchProgress.js
new file mode 100644
index 0000000000..693d0a3caa
--- /dev/null
+++ b/assets/apps/dashboard/src/Components/Content/LaunchProgress.js
@@ -0,0 +1,656 @@
+/* global neveDash */
+import { __ } from '@wordpress/i18n';
+import { useState, useEffect } from '@wordpress/element';
+import { LucideExternalLink, LucideCheck } from 'lucide-react';
+import Card from '../../Layout/Card';
+import Button from '../Common/Button';
+import TransitionWrapper from '../Common/TransitionWrapper';
+import cn from 'classnames';
+import apiFetch from '@wordpress/api-fetch';
+
+/**
+ * Initialize step state with auto-detection and saved progress
+ *
+ * @param {Array} steps - Array of step objects
+ * @param {string} sectionKey - Section key (identity, content, performance)
+ * @param {Object} savedProgress - Saved progress from server
+ * @param {Object} autoDetections - Auto-detection overrides by index
+ * @return {Array} Initialized state array
+ */
+const initializeStepState = (
+ steps,
+ sectionKey,
+ savedProgress,
+ autoDetections = {}
+) => {
+ return steps.map((step, index) => {
+ // Auto-detection overrides saved false values
+ if (autoDetections[index]) {
+ return true;
+ }
+
+ // Use saved progress if available
+ if (
+ savedProgress[sectionKey] &&
+ savedProgress[sectionKey][index] !== undefined
+ ) {
+ return savedProgress[sectionKey][index];
+ }
+
+ return step.completed;
+ });
+};
+
+const { plugins } = neveDash;
+
+const activeTPC =
+ plugins['templates-patterns-collection'] &&
+ plugins['templates-patterns-collection'].cta === 'deactivate';
+
+const LaunchProgress = () => {
+ // Get checks from neveDash
+ const checks = neveDash.launchProgress || {};
+ const autoDetected = checks.autoDetected || {};
+ const savedProgress = checks.savedProgress || {};
+
+ const [stepsState, setStepsState] = useState({
+ identity: initializeStepState(
+ identitySteps,
+ 'identity',
+ savedProgress,
+ {
+ 1: autoDetected.hasLogo,
+ 3: autoDetected.hasFavicon,
+ }
+ ),
+ content: initializeStepState(contentSteps, 'content', savedProgress),
+ performance: initializeStepState(
+ performanceSteps,
+ 'performance',
+ savedProgress,
+ {
+ 0: autoDetected.hasCustomPermalink,
+ 1: autoDetected.hasSeoPlugin,
+ 3: autoDetected.hasPrivacyPage,
+ }
+ ),
+ });
+
+ // Save progress whenever it changes
+ useEffect(() => {
+ const timeoutId = setTimeout(() => {
+ // Update neveDash object to keep it in sync
+ if (neveDash.launchProgress) {
+ neveDash.launchProgress.savedProgress = stepsState;
+ }
+
+ apiFetch({
+ path: '/nv/v1/dashboard/launch-progress',
+ method: 'POST',
+ data: { progress: stepsState },
+ }).catch((error) => {
+ // eslint-disable-next-line no-console
+ console.error('Failed to save progress:', error);
+ });
+ }, 500); // Debounce for 500ms
+
+ return () => clearTimeout(timeoutId);
+ }, [stepsState]);
+
+ // Calculate total steps and completed steps
+ const allCompleted = [
+ ...stepsState.identity,
+ ...stepsState.content,
+ ...stepsState.performance,
+ ];
+ const completedSteps = allCompleted.filter((completed) => completed).length;
+ const totalSteps = allCompleted.length;
+ const progressPercentage = (completedSteps / totalSteps) * 100;
+
+ // Trigger confetti when all steps are completed
+ useEffect(() => {
+ if (completedSteps === totalSteps && totalSteps > 0) {
+ triggerConfetti();
+ }
+ }, [completedSteps, totalSteps]);
+
+ return (
+
+ {/* Skip Setup Banner */}
+
+
+
+
+
+ ⚡
+
+
+ {__(
+ 'Import ready-made websites with a single click',
+ 'neve'
+ )}
+
+
+
+ {__(
+ 'Explore a vast library of pre-designed sites within Neve. Visit our constantly growing collection of demos to find the perfect starting point for your project.',
+ 'neve'
+ )}
+
+
+
+ {__('Starter Sites', 'neve')}
+
+
+
+ {completedSteps === totalSteps && totalSteps > 0 ? (
+ // Completion message
+
+
+
+ 🎉
+
+ {__(
+ 'Congratulations! Your Website is Ready for Launch!',
+ 'neve'
+ )}
+
+
+ {__(
+ "You've completed all essential setup steps. Take your site to the next level with Pro features!",
+ 'neve'
+ )}
+
+ {!neveDash.isValidLicense && (
+
+ {__('View Pro Plans', 'neve')}
+
+ )}
+
+
+
+
+ 🚀
+
+ {__('Launch Progress', 'neve')}
+
+
+ {__(
+ 'Complete these essential steps to launch your website',
+ 'neve'
+ )}
+
+
+
+
+ {completedSteps}/{totalSteps}
+
+
+ {__('Steps Completed', 'neve')}
+
+
+
+
+
+ );
+};
+
+const StepSection = ({
+ title,
+ steps,
+ sectionKey,
+ stepsState,
+ setStepsState,
+ startIndex = 1,
+}) => {
+ const stepsCount = steps.length;
+
+ return (
+
+
+
{title}
+
+ {stepsCount} {__('Steps', 'neve')}
+
+
+
+ {steps.map((step, index) => (
+ {
+ setStepsState((prev) => ({
+ ...prev,
+ [sectionKey]: prev[sectionKey].map(
+ (completed, i) =>
+ i === index ? !completed : completed
+ ),
+ }));
+ }}
+ />
+ ))}
+
+
+ );
+};
+
+const StepItem = ({ step, index, isCompleted, onToggle }) => {
+ const checkboxClasses = cn(
+ 'size-6 rounded border-2 flex items-center justify-center cursor-pointer transition-all shrink-0',
+ {
+ 'bg-blue-600 border-blue-600': isCompleted,
+ 'bg-white border-gray-300 hover:border-gray-400': !isCompleted,
+ }
+ );
+
+ const handleToggle = (e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ onToggle();
+ };
+
+ const handleKeyDown = (e) => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ e.preventDefault();
+ e.stopPropagation();
+ onToggle();
+ }
+ };
+
+ const handleButtonClick = (e) => {
+ e.stopPropagation();
+
+ if (!isCompleted) {
+ onToggle();
+ }
+
+ if (step.link.startsWith('http')) {
+ window.open(step.link, '_blank', 'noopener,noreferrer');
+ } else {
+ window.location.href = step.link;
+ }
+ };
+
+ const handleRowClick = () => {
+ onToggle();
+ };
+
+ const handleRowKeyDown = (e) => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ e.preventDefault();
+ onToggle();
+ }
+ };
+
+ return (
+
+
+ {isCompleted && (
+
+
+ {index}
+
+
+
+ {step.title}
+
+
{step.description}
+
+
+ {__('Set Up', 'neve')}
+
+
+ {__('Get Neve Pro', 'neve')}
+
)}
);
diff --git a/assets/apps/dashboard/src/Components/Content/Settings/GeneralTabContent.js b/assets/apps/dashboard/src/Components/Content/Settings/GeneralTabContent.js
index 4a1c828892..75f9e67fd8 100644
--- a/assets/apps/dashboard/src/Components/Content/Settings/GeneralTabContent.js
+++ b/assets/apps/dashboard/src/Components/Content/Settings/GeneralTabContent.js
@@ -7,6 +7,7 @@ import {
LucideMonitorDown,
LucideTags,
LucideType,
+ LucideExternalLink,
} from 'lucide-react';
import useLicenseData from '../../../Hooks/useLicenseData';
import { NEVE_HAS_VALID_PRO } from '../../../utils/constants';
@@ -16,6 +17,7 @@ import OptionGroup from './OptionGroup';
import ControlWrap from '../../Controls/ControlWrap';
import Toggle from '../../Common/Toggle';
import Select from '../../Common/Select';
+import Button from '../../Common/Button';
const DUMMY_SETTINGS_ARGS = {
enable_featured_image_taxonomy: {
@@ -185,9 +187,22 @@ export default () => {
return (
<>
-
- {__('General Settings', 'neve')}
-
+
+
+ {__('General Settings', 'neve')}
+
+
+ {!isLicenseValid && (
+
+ {__('Get Neve Pro', 'neve')}
+
+ )}
+
{(isLicenseValid &&
) ||
}
diff --git a/assets/apps/dashboard/src/Components/Content/Settings/ManageModulesTabContent.js b/assets/apps/dashboard/src/Components/Content/Settings/ManageModulesTabContent.js
index 8a077600b0..8248c15ff1 100644
--- a/assets/apps/dashboard/src/Components/Content/Settings/ManageModulesTabContent.js
+++ b/assets/apps/dashboard/src/Components/Content/Settings/ManageModulesTabContent.js
@@ -1,5 +1,11 @@
+import AvailableModule from '../AvailableModule';
import ModuleGrid from '../ModuleGrid';
export default () => {
- return
;
+ return (
+ <>
+
+
+
+ );
};
diff --git a/assets/apps/dashboard/src/Components/Content/Settings/PerformanceTabContent.js b/assets/apps/dashboard/src/Components/Content/Settings/PerformanceTabContent.js
index 536e468d8a..1efe58f04e 100644
--- a/assets/apps/dashboard/src/Components/Content/Settings/PerformanceTabContent.js
+++ b/assets/apps/dashboard/src/Components/Content/Settings/PerformanceTabContent.js
@@ -1,7 +1,14 @@
/* global neveDash */
import { __ } from '@wordpress/i18n';
-import { LucideCode, LucideSmile, LucideText, LucideZap } from 'lucide-react';
+import {
+ LucideCode,
+ LucideSmile,
+ LucideText,
+ LucideZap,
+ LucideExternalLink,
+} from 'lucide-react';
import ToggleControl from '../../Controls/ToggleControl';
+import Button from '../../Common/Button';
import useLicenseData from '../../../Hooks/useLicenseData';
import OptionGroup from './OptionGroup';
@@ -78,9 +85,22 @@ export default () => {
return (
<>
-
- {__('Performance Settings', 'neve')}
-
+
+
+ {__('Performance Settings', 'neve')}
+
+
+ {!isLicenseValid && (
+
+ {__('Get Neve Pro', 'neve')}
+
+ )}
+
{
const [toast, setToast] = useState('');
const [toastType, setToastType] = useState('success');
- const { valid, expiration } = license;
+ const { valid, expiration, tier } = license;
const { whiteLabel, strings } = neveDash;
const { licenseCardHeading, licenseCardDescription } = strings;
const isValid = 'valid' === valid;
@@ -70,6 +70,17 @@ const LicenseCard = () => {
return statusLabelMap[status];
};
+ const getPlanLabel = () => {
+ const planLabel = {
+ 1: __('Personal', 'neve'),
+ 2: __('Business', 'neve'),
+ 3: __('Agency', 'neve'),
+ };
+
+ return planLabel[tier] || null;
+ };
+ const planLabel = getPlanLabel();
+
return (
@@ -124,6 +135,11 @@ const LicenseCard = () => {
)}
{isOrWasValid && (
+ {planLabel && (
+
+ {planLabel}
+
+ )}
(
@@ -107,6 +109,54 @@ const ContributingCard = () => {
);
};
+const UpsellCard = () => {
+ return (
+
+
+
+ {__('Need help deciding?', 'neve')}
+
+
+
+ {__(
+ 'Our support team is happy to answer your questions about specific Pro features and help you determine if they match your needs.',
+ 'neve'
+ )}
+
+
+
+ {__(
+ 'Average response time: ~8 hours during business days',
+ 'neve'
+ )}
+
+
+
+
+
+ {__('View Pro Plans', 'neve')}
+
+
+ {__('Contact Support', 'neve')}
+
+
+
+ );
+};
+
const CommunityCard = () => {
return (
@@ -127,12 +177,21 @@ const CommunityCard = () => {
};
const Sidebar = () => {
+ const { currentTab } = useSelect((select) => {
+ const { getTab } = select(NEVE_STORE);
+ return {
+ currentTab: getTab(),
+ };
+ });
+
return (
{NEVE_HAS_PRO &&
}
{NEVE_HAS_PRO &&
}
+ {currentTab === 'free-pro' &&
}
+
{!NEVE_IS_WHITELABEL &&
}
{!NEVE_HAS_PRO &&
}
diff --git a/assets/apps/dashboard/src/Components/Header.js b/assets/apps/dashboard/src/Components/Header.js
index d39bfd3ec2..ca7818cae6 100644
--- a/assets/apps/dashboard/src/Components/Header.js
+++ b/assets/apps/dashboard/src/Components/Header.js
@@ -6,7 +6,11 @@ import { Fragment, useEffect } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import { useDispatch, useSelect } from '@wordpress/data';
-import { LucideBookOpen, LucideFileText } from 'lucide-react';
+import {
+ LucideBookOpen,
+ LucideFileText,
+ LucideExternalLink,
+} from 'lucide-react';
import useLicenseData from '../Hooks/useLicenseData';
import Container from '../Layout/Container';
import { NEVE_IS_WHITELABEL, NEVE_STORE } from '../utils/constants';
@@ -107,6 +111,8 @@ const HeaderTopBar = ({ currentTab, setTab }) => {
};
const Navigation = ({ setTab, currentTab }) => {
+ const { isLicenseValid } = useLicenseData();
+
return (
@@ -115,13 +121,22 @@ const Navigation = ({ setTab, currentTab }) => {
if (!label) {
return null;
}
+ // Hide "Get Neve Pro" tab for users with valid licenses
+ if (slug === 'get-neve-pro' && isLicenseValid) {
+ return null;
+ }
const itemClasses = cn([
'relative px-4 py-3 font-medium border-b-2',
{
'text-blue-600 border-blue-600':
- currentTab === slug,
+ currentTab === slug &&
+ slug !== 'get-neve-pro',
'border-transparent text-gray-600 hover:text-gray-900 transition-colors duration-150':
- currentTab !== slug,
+ currentTab !== slug &&
+ slug !== 'get-neve-pro',
+ 'border-transparent text-blue-600 transition-colors duration-150':
+ currentTab !== slug &&
+ slug === 'get-neve-pro',
},
]);
@@ -136,6 +151,9 @@ const Navigation = ({ setTab, currentTab }) => {
if (!url) {
linkProps.onClick = handleLinkClick;
+ } else {
+ linkProps.target = '_blank';
+ linkProps.rel = 'noopener noreferrer';
}
return (
@@ -144,7 +162,15 @@ const Navigation = ({ setTab, currentTab }) => {
key={slug}
className={itemClasses}
>
- {label}
+
+ {label}
+ {url && (
+
);
})}
diff --git a/assets/apps/dashboard/src/store/actions.js b/assets/apps/dashboard/src/store/actions.js
index ab6f81dc71..802451a46e 100644
--- a/assets/apps/dashboard/src/store/actions.js
+++ b/assets/apps/dashboard/src/store/actions.js
@@ -50,4 +50,10 @@ export default {
payload: loggerStatus,
};
},
+ setObfxModuleStatus(slug, value) {
+ return {
+ type: 'SET_OBFX_MODULE_STATUS',
+ payload: { slug, value },
+ };
+ },
};
diff --git a/assets/apps/dashboard/src/store/reducer.js b/assets/apps/dashboard/src/store/reducer.js
index d2cd911b7c..e9f5ec628e 100644
--- a/assets/apps/dashboard/src/store/reducer.js
+++ b/assets/apps/dashboard/src/store/reducer.js
@@ -8,6 +8,7 @@ const initialState = {
currentTab: 'start',
license: neveDash.pro ? neveDash.license : {},
notifications: neveDash.notifications || {},
+ obfxModuleStatus: neveDash.orbitFox?.data?.module_status || {},
};
const hash = getTabHash();
@@ -73,6 +74,16 @@ const reducer = (state = initialState, action) => {
neve_logger_flag: action.payload,
},
};
+ case 'SET_OBFX_MODULE_STATUS':
+ return {
+ ...state,
+ obfxModuleStatus: {
+ ...state.obfxModuleStatus,
+ [action.payload.slug]: {
+ active: action.payload.value,
+ },
+ },
+ };
}
return state;
};
diff --git a/assets/apps/dashboard/src/store/selectors.js b/assets/apps/dashboard/src/store/selectors.js
index cb576148e4..c49ad370d5 100644
--- a/assets/apps/dashboard/src/store/selectors.js
+++ b/assets/apps/dashboard/src/store/selectors.js
@@ -25,4 +25,15 @@ export default {
return shownNotifications;
},
+ getObfxModuleStatus: (state, slug) => {
+ if (!state.obfxModuleStatus) {
+ return false;
+ }
+
+ if (state.obfxModuleStatus[slug]) {
+ return state.obfxModuleStatus[slug]?.active || false;
+ }
+
+ return false;
+ },
};
diff --git a/assets/apps/dashboard/src/utils/common.js b/assets/apps/dashboard/src/utils/common.js
index a145c5e438..0ebe8f1f6a 100644
--- a/assets/apps/dashboard/src/utils/common.js
+++ b/assets/apps/dashboard/src/utils/common.js
@@ -6,6 +6,7 @@ import Welcome from '../Components/Content/Welcome';
import FreePro from '../Components/Content/FreePro';
import Settings from '../Components/Content/Settings';
import Changelog from '../Components/Content/Changelog';
+import LaunchProgress from '../Components/Content/LaunchProgress';
import { __ } from '@wordpress/i18n';
@@ -18,6 +19,10 @@ const tabs = {
label: __('Starter Sites', 'neve'),
render: () =>
+
+
toggle(id)}
+ />
+ {elements[id]}
+
+
+ e.preventDefault()}
+ onKeyDown={handleKeyDown}
+ onBlur={handleBlur}
+ tabIndex={0}
+ type="button"
+ >
+
+
+
+
+
{
list={value}
setList={updateElement}
handle=".ti-sortable-handle"
- animation="300"
+ animation={300}
>
- {value.map((item) => {
- const { id, visible } = item;
- return (
-
-
-
{
- toggle(id);
- }}
- />
-
- {elements[id]}
-
-
-
-
-
);
diff --git a/assets/apps/metabox/src/editor.scss b/assets/apps/metabox/src/editor.scss
index b10ea5442a..4927d1da09 100644
--- a/assets/apps/metabox/src/editor.scss
+++ b/assets/apps/metabox/src/editor.scss
@@ -99,14 +99,44 @@
flex-basis: 20%;
cursor: move;
- .components-button {
- color: #bfbfbf;
+ // Enhanced custom handle button styling
+ .ti-sortable-handle-btn {
+ width: 32px;
+ height: 32px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #d5dadf;
+ background: #f6f7f7;
+ border-radius: 4px;
+ color: #6c6c6c;
+ cursor: move;
+ padding: 0;
+ transition: background .15s ease, box-shadow .15s ease, color .15s ease;
+ }
- &:hover, &:focus {
- color: #bfbfbf;
- box-shadow: none;
- background: none;
- }
+ .ti-sortable-handle-btn:hover {
+ background: #ebedef;
+ color: #444444;
+ }
+
+ .ti-sortable-handle-btn:focus {
+ outline: none;
+ background: #ffffff;
+ box-shadow: 0 0 0 2px #2271b1;
+ color: #1e1e1e;
+ }
+
+ &.keyboard-active .ti-sortable-handle-btn {
+ background: #2271b1;
+ color: #ffffff;
+ box-shadow: 0 0 0 2px #2271b1;
+ border-color: #2271b1;
+ }
+
+ .ti-sortable-handle-btn .dashicons {
+ font-size: 18px;
+ line-height: 1;
}
}
diff --git a/assets/js/src/customizer-preview/app.js b/assets/js/src/customizer-preview/app.js
index 15c683cfcf..19a30ae343 100644
--- a/assets/js/src/customizer-preview/app.js
+++ b/assets/js/src/customizer-preview/app.js
@@ -25,6 +25,26 @@ function handleResponsiveRadioButtons(args, nextValue) {
});
}
+window.wp.customize.bind('ready', () => {
+ previewScrollToTopChanges();
+});
+
+/**
+ * Preview scroll to top changes made in customizer.
+ */
+function previewScrollToTopChanges() {
+ wp.customize.preview.bind('nv-opened-stt', (show) => {
+ if (show) {
+ const scrollToTopBtn = document.querySelector('#scroll-to-top');
+ if (!scrollToTopBtn) {
+ return;
+ }
+ scrollToTopBtn.style.visibility = 'visible';
+ scrollToTopBtn.style.opacity = '1';
+ }
+ });
+}
+
/**
* Run JS on preview-ready.
*/
@@ -91,6 +111,217 @@ wp.customize.bind('preview-ready', function () {
selector + '{font-family: ' + parsedFontFamily + ' ;}'
);
});
+
+ // Handle Style Book toggle
+ wp.customize.preview.bind('neve-toggle-style-book', function (isOpen) {
+ const styleBookContent = document.getElementById('nv-sb-container');
+
+ if (!styleBookContent) {
+ return;
+ }
+
+ // If state is explicitly passed, use it; otherwise toggle current state
+ const shouldOpen =
+ typeof isOpen === 'boolean'
+ ? isOpen
+ : styleBookContent.style.display === 'none';
+
+ if (shouldOpen) {
+ styleBookContent.style.display = 'block';
+ document.body.classList.add('nv-sb-open');
+ } else {
+ styleBookContent.style.display = 'none';
+ document.body.classList.remove('nv-sb-open');
+ }
+ });
+
+ // Handle Style Book state restoration
+ wp.customize.preview.bind(
+ 'neve-restore-style-book-state',
+ function (isOpen) {
+ const styleBookContent = document.getElementById('nv-sb-container');
+
+ if (!styleBookContent) {
+ return;
+ }
+
+ if (isOpen) {
+ styleBookContent.style.display = 'block';
+ document.body.classList.add('nv-sb-open');
+ }
+ }
+ );
+
+ // Handle Style Book close button
+ document.addEventListener('click', function (e) {
+ if (
+ e.target.closest('.neve-style-book-close') ||
+ e.target.closest('.nv-sb-close-btn')
+ ) {
+ const styleBookContent = document.getElementById('nv-sb-container');
+ if (styleBookContent) {
+ styleBookContent.style.display = 'none';
+ document.body.classList.remove('nv-sb-open');
+ // Notify customizer controls about state change
+ wp.customize.preview.send(
+ 'neve-style-book-state-changed',
+ false
+ );
+ }
+ }
+
+ // Close when clicking outside the modal
+ if (e.target.classList.contains('neve-style-book-overlay')) {
+ const styleBookContent = document.getElementById('nv-sb-container');
+ if (styleBookContent) {
+ styleBookContent.style.display = 'none';
+ document.body.classList.remove('nv-sb-open');
+ // Notify customizer controls about state change
+ wp.customize.preview.send(
+ 'neve-style-book-state-changed',
+ false
+ );
+ }
+ }
+ });
+
+ // Handle Style Book clickable items navigation
+ document.addEventListener('click', function (e) {
+ // Skip navigation if clicking inside form fields (input, textarea, select)
+ if (e.target.matches('input, textarea, select')) {
+ e.stopPropagation();
+ return;
+ }
+
+ // Handle click on any Style Book builder-item-focus element
+ const styleBookItem = e.target.closest(
+ '#nv-sb-container .builder-item-focus'
+ );
+
+ if (styleBookItem) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ // Prioritize data-control if it exists, otherwise use data-section
+ const controlId = styleBookItem.getAttribute('data-control');
+ const sectionId = styleBookItem.getAttribute('data-section');
+
+ if (
+ window.parent &&
+ window.parent.wp &&
+ window.parent.wp.customize
+ ) {
+ try {
+ // If data-control is specified, handle the control
+ if (controlId) {
+ // Check if this is a color control (starts with neve-color-slug-)
+ if (controlId.startsWith('neve-color-slug-')) {
+ // Color controls don't have a control object, just find by class
+ const section =
+ window.parent.wp.customize.section(sectionId);
+ if (
+ section &&
+ typeof section.focus === 'function'
+ ) {
+ section.focus();
+
+ setTimeout(() => {
+ const colorControl =
+ window.parent.document.querySelector(
+ '.' + controlId
+ );
+ if (colorControl) {
+ const colorButton =
+ colorControl.querySelector(
+ '.components-button'
+ );
+ if (colorButton) {
+ colorButton.click();
+ }
+ }
+ }, 100);
+ }
+ return;
+ }
+
+ // Regular controls (accordions, buttons, etc.)
+ const control =
+ window.parent.wp.customize.control(controlId);
+
+ // Try to focus if the control has a focus method
+ if (control && typeof control.focus === 'function') {
+ control.focus();
+ }
+
+ // Handle accordion expansion after focusing
+ setTimeout(() => {
+ const controlElement =
+ window.parent.document.getElementById(
+ 'customize-control-' + controlId
+ );
+ if (controlElement) {
+ // Close all other expanded accordions in the same section
+ const section =
+ controlElement.closest('.control-section');
+ if (section) {
+ section
+ .querySelectorAll(
+ '.customize-control.expanded'
+ )
+ .forEach((accordion) => {
+ if (
+ accordion.id !==
+ 'customize-control-' + controlId
+ ) {
+ accordion.classList.remove(
+ 'expanded'
+ );
+ }
+ });
+ }
+
+ // Expand the target accordion if not already expanded
+ if (
+ !controlElement.classList.contains(
+ 'expanded'
+ )
+ ) {
+ const heading =
+ controlElement.querySelector(
+ '.neve-customizer-heading'
+ );
+ if (heading) {
+ heading.click();
+ }
+ }
+ }
+ }, 100);
+ return;
+ } // If data-section is specified or control focus failed, focus on section
+ if (sectionId) {
+ const section =
+ window.parent.wp.customize.section(sectionId);
+ if (section && typeof section.focus === 'function') {
+ section.focus();
+ }
+ }
+ } catch (error) {
+ // Fallback: Try to expand the section if focusing fails
+ try {
+ if (sectionId) {
+ const section =
+ window.parent.wp.customize.section(sectionId);
+ if (section && section.expanded) {
+ section.expanded(true);
+ }
+ }
+ } catch (fallbackError) {
+ // Silent fallback - navigation failed
+ }
+ }
+ }
+ }
+ });
});
/**
diff --git a/assets/js/src/scroll-to-top.js b/assets/js/src/scroll-to-top.js
new file mode 100644
index 0000000000..3672abe1bd
--- /dev/null
+++ b/assets/js/src/scroll-to-top.js
@@ -0,0 +1,97 @@
+/*global neveScrollOffset*/
+
+function scrollTopSafe(to) {
+ let i = window.scrollY;
+ to = parseInt(to);
+ const scrollInterval = setInterval(function () {
+ if (i < to + 20) i -= 1;
+ else if (i < to + 40) i -= 6;
+ else if (i < to + 80) i -= 16;
+ else if (i < to + 160) i -= 36;
+ else if (i < to + 200) i -= 48;
+ else if (i < to + 300) i -= 80;
+ else i -= 120;
+ window.scroll(0, i);
+ if (i <= to) clearInterval(scrollInterval);
+ }, 15);
+}
+
+function runScroll() {
+ const smoothScrollFeature =
+ 'scrollBehavior' in document.documentElement.style;
+ if (!smoothScrollFeature) {
+ scrollTopSafe(0);
+ } else {
+ window.scrollTo({
+ top: 0,
+ behavior: 'smooth',
+ });
+ }
+ const content = document.getElementById('content');
+ const scrollButton = document.getElementById('scroll-to-top');
+ if (content) {
+ scrollButton.blur();
+ content.focus();
+ }
+}
+function scrollToTop() {
+ const element = document.getElementById('scroll-to-top');
+ if (!element) {
+ return false;
+ }
+
+ element.addEventListener('click', function () {
+ runScroll();
+ });
+
+ element.addEventListener('keydown', function (event) {
+ if (event.key === 'Enter') {
+ runScroll();
+ }
+ });
+
+ window.addEventListener('scroll', function () {
+ const yScrollPos = window.scrollY;
+ const offset = neveScrollOffset.offset;
+
+ if (yScrollPos > offset) {
+ element.style.visibility = 'visible';
+ element.style.opacity = '1';
+ }
+ if (yScrollPos <= offset) {
+ element.style.opacity = '0';
+ element.style.visibility = 'hidden';
+ }
+
+ // Change scroll to top position if there is a sticky add to cart in place.
+ const stickyAddToCart = document.querySelector(
+ '.sticky-add-to-cart-bottom'
+ );
+ if (stickyAddToCart) {
+ element.style.bottom = '30px';
+
+ // Try to get Neve's sticky footer. If it doesn't exist try to get Elementor's.
+ let stickyFooter = document.querySelector('.hfg_footer');
+ if (
+ !stickyFooter ||
+ !stickyFooter.classList.contains('has-sticky-rows')
+ ) {
+ stickyFooter = document.querySelector(
+ '.elementor-location-footer .elementor-sticky'
+ );
+ }
+ const footerHeight = stickyFooter ? stickyFooter.offsetHeight : 0;
+
+ if (
+ stickyAddToCart.classList.contains('sticky-add-to-cart--active')
+ ) {
+ element.style.bottom =
+ stickyAddToCart.offsetHeight + footerHeight + 10 + 'px';
+ }
+ }
+ });
+}
+
+window.addEventListener('load', function () {
+ scrollToTop();
+});
diff --git a/assets/js/src/shop/app.js b/assets/js/src/shop/app.js
index cd9740586f..32143062f7 100644
--- a/assets/js/src/shop/app.js
+++ b/assets/js/src/shop/app.js
@@ -1,95 +1,158 @@
/* jshint esversion: 6 */
-/* global CustomEvent */
+/* global jQuery, CustomEvent */
+/* global neveShopSlider */
import { tns } from 'tiny-slider/src/tiny-slider';
-/**
- * Init shop.
- */
-function initShop() {
- if (document.body.classList.contains('woocommerce')) {
- handleShopSidebar();
+(function ($) {
+ /**
+ * Init shop.
+ */
+ function initShop() {
+ const $body = $('body');
+ if ($body.hasClass('woocommerce')) {
+ handleShopSidebar();
+ }
+
+ const countExclusive = $('.exclusive-products li.product').length;
+
+ if ($body.hasClass('nv-exclusive') && countExclusive > 4) {
+ handleExclusiveSlider();
+ }
+
+ if (
+ '1' !== neveShopSlider.isSparkActive &&
+ $body.hasClass('single-product')
+ ) {
+ handleGallerySlider();
+ }
}
- const countExclusive = document.querySelectorAll(
- '.exclusive-products li.product'
- ).length;
+ /**
+ * Add prev and next
+ *
+ * @param {Node} targetNode
+ * @param {Node} slider
+ * @param {string} vertical
+ */
+ function addNextPrev(targetNode, slider, vertical = false) {
+ const $next = $('>
+ * }
+ */
+ private function get_launch_progress_checks() {
+ // Check if we should show the Launch Progress tab
+ $show_launch_progress = get_option( \Neve\Core\Admin::$launch_progress_option );
+ if ( false === $show_launch_progress ) {
+ $install_time = get_option( 'neve_install' );
+ if ( ! empty( $install_time ) ) {
+ $one_week_ago = time() - WEEK_IN_SECONDS;
+ $show_launch_progress = ( intval( $install_time ) > $one_week_ago ) ? 'yes' : 'no';
+ update_option( \Neve\Core\Admin::$launch_progress_option, $show_launch_progress, false );
+ } else {
+ $show_launch_progress = 'no';
+ }
+ }
+
+ $has_logo = (bool) get_theme_mod( 'custom_logo' );
+ $has_favicon = (bool) get_site_icon_url();
+ $permalink_structure = get_option( 'permalink_structure' );
+
+ // Check if SEO plugin is active (Yoast, RankMath, or AIOSEO)
+ $has_seo_plugin = (
+ class_exists( 'WPSEO_Options' ) || // Yoast SEO
+ class_exists( 'RankMath' ) || // RankMath
+ function_exists( 'aioseo' ) // All in One SEO
+ );
+
+ // Check if privacy policy page exists
+ $privacy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+ $has_privacy_page = $privacy_page_id > 0 && get_post_status( $privacy_page_id ) === 'publish';
+
+ // Get saved progress from option
+ $saved_progress = get_option( 'neve_launch_progress', [] );
+
+ return [
+ 'showLaunchProgress' => ( $show_launch_progress === 'yes' ),
+ 'autoDetected' => [
+ 'hasLogo' => $has_logo,
+ 'hasFavicon' => $has_favicon,
+ 'hasCustomPermalink' => ! empty( $permalink_structure ),
+ 'hasSeoPlugin' => $has_seo_plugin,
+ 'hasPrivacyPage' => $has_privacy_page,
+ ],
+ 'savedProgress' => $saved_progress,
+ ];
+ }
+
/**
* Get doc link.
*
@@ -645,8 +751,11 @@ private function get_free_pro_features() {
private function get_modules() {
$plugins = array(
'hfg_module' => array(
- 'nicename' => __( 'Header Booster', 'neve' ),
- 'description' => __( 'Create unique sticky & transparent headers that adapt to scroll. Perfect for modern, immersive websites.', 'neve' ),
+ 'nicename' => __( 'Header Booster', 'neve' ),
+ 'description' => __( 'Create unique sticky & transparent headers that adapt to scroll. Perfect for modern, immersive websites.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1057-header-booster-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=headerbooster&utm_content=neve',
+ ),
),
'woocommerce_booster' => array(
'nicename' => __( 'WooCommerce Booster', 'neve' ),
@@ -660,32 +769,46 @@ private function get_modules() {
'condition' => class_exists( 'Easy_Digital_Downloads' ),
),
'blog_pro' => array(
- 'nicename' => __( 'Blog Booster', 'neve' ),
- 'description' => __( 'Advanced layouts, reading time estimates, and social sharing to keep readers engaged longer.', 'neve' ),
+ 'nicename' => __( 'Blog Booster', 'neve' ),
+ 'description' => __( 'Advanced layouts, reading time estimates, and social sharing to keep readers engaged longer.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1059-blog-booster-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=blogbooster&utm_content=neve',
+ ),
),
'post_type_enhancements' => array(
- 'nicename' => __( 'Post types enhancements', 'neve' ),
- 'description' => __( 'Extend Neve\'s powerful features to custom post types. Create unique layouts for portfolios, testimonials, and more.', 'neve' ),
- ),
- 'scroll_to_top' => array(
- 'nicename' => __( 'Scroll To Top', 'neve' ),
- 'description' => __( 'Add a customizable scroll-to-top button that appears exactly when needed. Style it to match your brand.', 'neve' ),
+ 'nicename' => __( 'Post types enhancements', 'neve' ),
+ 'description' => __( 'Extend Neve\'s powerful features to custom post types. Create unique layouts for portfolios, testimonials, and more.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1505-neve-post-type-enhancements-module?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=postenhancements&utm_content=neve',
+ ),
),
'performance_features' => array(
- 'nicename' => __( 'Performance', 'neve' ),
- 'description' => __( 'Optimize core vitals, enable lazy loading, and minify resources for lightning-fast load times.', 'neve' ),
+ 'nicename' => __( 'Performance', 'neve' ),
+ 'description' => __( 'Optimize core vitals, enable lazy loading, and minify resources for lightning-fast load times.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1366-performance-module-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=performancemodule&utm_content=neve',
+ ),
),
'block_editor_booster' => array(
- 'nicename' => __( 'Block Editor Booster', 'neve' ),
- 'description' => __( 'Advanced Gutenberg blocks designed specifically for Neve. Build faster with pre-styled patterns.', 'neve' ),
+ 'nicename' => __( 'Block Editor Booster', 'neve' ),
+ 'description' => __( 'Advanced Gutenberg blocks designed specifically for Neve. Build faster with pre-styled patterns.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1473-neve-block-editor-booster-module?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=blockeditorbooster&utm_content=neve',
+ ),
),
'white_label' => array(
- 'nicename' => __( 'White Label', 'neve' ),
- 'description' => __( 'Rebrand Neve as your own. Change theme name, author, and links to match your agency identity.', 'neve' ),
+ 'nicename' => __( 'White Label', 'neve' ),
+ 'description' => __( 'Rebrand Neve as your own. Change theme name, author, and links to match your agency identity.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1061-white-label-module-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=whitelabel&utm_content=neve',
+ ),
),
'custom_layouts' => array(
- 'nicename' => __( 'Custom Layouts', 'neve' ),
- 'description' => __( 'Create conditional headers, footers, and content blocks. Perfect for custom landing pages and marketing campaigns.', 'neve' ),
+ 'nicename' => __( 'Custom Layouts', 'neve' ),
+ 'description' => __( 'Create conditional headers, footers, and content blocks. Perfect for custom landing pages and marketing campaigns.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1062-custom-layouts-module?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=customlayouts&utm_content=neve',
+ ),
),
'elementor_booster' => array(
'nicename' => __( 'Elementor Booster', 'neve' ),
@@ -698,16 +821,32 @@ private function get_modules() {
'condition' => class_exists( 'LifterLMS' ),
),
'typekit_fonts' => array(
- 'nicename' => __( 'Typekit Fonts', 'neve' ),
- 'description' => __( 'Access premium Adobe fonts directly in your theme. Add professional typography to any element.', 'neve' ),
+ 'nicename' => __( 'Typekit Fonts', 'neve' ),
+ 'description' => __( 'Access premium Adobe fonts directly in your theme. Add professional typography to any element.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1085-typekit-fonts-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=typekitfonts&utm_content=neve',
+ ),
),
'custom_sidebars' => array(
- 'nicename' => __( 'Custom Sidebars', 'neve' ),
- 'description' => __( 'Create unique sidebar layouts for different sections. Show relevant content based on user context.', 'neve' ),
+ 'nicename' => __( 'Custom Sidebars', 'neve' ),
+ 'description' => __( 'Create unique sidebar layouts for different sections. Show relevant content based on user context.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1770-custom-sidebars-module-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=customsidebars&utm_content=neve',
+ ),
),
'access_restriction' => array(
- 'nicename' => __( 'Content restriction', 'neve' ),
- 'description' => __( 'Create members-only content areas. Control access by user roles, logged-in status, or custom rules.', 'neve' ),
+ 'nicename' => __( 'Content restriction', 'neve' ),
+ 'description' => __( 'Create members-only content areas. Control access by user roles, logged-in status, or custom rules.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/1863-content-restriction-module-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=contentrestriction&utm_content=neve',
+ ),
+ ),
+ 'dashboard_customizer' => array(
+ 'nicename' => __( 'WP Dashboard Customizer', 'neve' ),
+ 'description' => __( 'Create or modify the WordPress dashboard. Customize the admin pages, admin menu, and admin bar.', 'neve' ),
+ 'documentation' => array(
+ 'url' => 'https://docs.themeisle.com/article/2408-wp-dashboard-customizer-module-documentation?utm_source=wpadmin&utm_medium=welcomepage&utm_campaign=dashboardcustomizer&utm_content=neve',
+ ),
),
);
@@ -824,6 +963,34 @@ private function get_external_plugins_data() {
return $plugins;
}
+ /**
+ * Get available modules.
+ *
+ * @return array
+ */
+ private function get_available_modules() {
+ $modules = array(
+ 'login-customizer' => array(
+ 'title' => __( 'Login Customizer', 'neve' ),
+ 'description' => __( 'Customize your WordPress login page with branding and styling options.', 'neve' ),
+ ),
+ 'custom-fonts' => array(
+ 'title' => __( 'Custom Fonts/Scripts', 'neve' ),
+ 'description' => __( 'Add custom fonts and scripts to your website easily.', 'neve' ),
+ ),
+ 'policy-notice' => array(
+ 'title' => __( 'Cookie Notice', 'neve' ),
+ 'description' => __( 'Display a customizable cookie consent notice for GDPR compliance.', 'neve' ),
+ ),
+ 'post-duplicator' => array(
+ 'title' => __( 'Duplicate Page', 'neve' ),
+ 'description' => __( 'Quickly duplicate posts, pages, and custom post types.', 'neve' ),
+ ),
+ );
+
+ return apply_filters( 'neve_available_modules', $modules );
+ }
+
/**
* Renders the custom layout header section in the admin dashboard for Custom Layouts
*
diff --git a/inc/compatibility/elementor.php b/inc/compatibility/elementor.php
index b258907c83..d2dca99088 100644
--- a/inc/compatibility/elementor.php
+++ b/inc/compatibility/elementor.php
@@ -80,6 +80,7 @@ public function init() {
*/
add_filter( 'neve_pro_run_wc_view', array( $this, 'suspend_woo_customizations' ), 10, 2 );
add_action( 'elementor/theme/register_locations', array( $this, 'register_elementor_locations' ) );
+ add_filter( 'elementor/document/config', array( $this, 'elementor_document_config' ), 10, 2 );
}
/**
@@ -567,4 +568,26 @@ public function suspend_woo_customizations( $should_load, $class_name ) {
return ! $elementor_overrides;
}
+
+ /**
+ * Allow Post Content widget to be shown in the panel for neve_custom_layouts post type.
+ *
+ * @param array $data The original data that needs to be saved.
+ * @param int $post_id The ID of the post for which the data is being saved.
+ *
+ * @return array The modified data with the additional configuration.
+ */
+ public function elementor_document_config( $data, $post_id ) {
+ if ( 'neve_custom_layouts' === get_post_type( $post_id ) ) {
+ $data['panel'] = array(
+ 'widgets_settings' => array(
+ 'theme-post-content' => array(
+ 'show_in_panel' => true,
+ ),
+ ),
+ );
+ }
+
+ return $data;
+ }
}
diff --git a/inc/core/admin.php b/inc/core/admin.php
index dca7974ea0..27e97823a1 100644
--- a/inc/core/admin.php
+++ b/inc/core/admin.php
@@ -22,6 +22,13 @@
class Admin {
use Theme_Info;
+ /**
+ * Launch progress option key.
+ *
+ * @var string
+ */
+ public static $launch_progress_option = 'neve_show_launch_progress';
+
/**
* Dismiss notice key.
*
@@ -303,6 +310,67 @@ public function register_rest_routes() {
],
]
);
+
+ register_rest_route(
+ 'nv/v1/dashboard',
+ '/activate-plugin',
+ array(
+ 'methods' => \WP_REST_Server::EDITABLE,
+ 'callback' => [ $this, 'activate_plugin' ],
+ 'permission_callback' => function() {
+ return ( current_user_can( 'install_plugins' ) && current_user_can( 'activate_plugins' ) );
+ },
+ 'args' => array(
+ 'slug' => array(
+ 'required' => true,
+ 'sanitize_callback' => 'sanitize_key',
+ ),
+ ),
+ )
+ );
+
+ register_rest_route(
+ 'nv/v1/dashboard',
+ '/launch-progress',
+ [
+ 'methods' => \WP_REST_Server::EDITABLE,
+ 'callback' => [ $this, 'save_launch_progress' ],
+ 'permission_callback' => function() {
+ return current_user_can( 'manage_options' );
+ },
+ 'args' => array(
+ 'progress' => array(
+ 'required' => true,
+ 'sanitize_callback' => function( $value ) {
+ return is_array( $value ) ? $value : [];
+ },
+ ),
+ ),
+ ]
+ );
+
+ register_rest_route(
+ 'nv/v1/dashboard',
+ '/activate-module',
+ [
+ 'methods' => \WP_REST_Server::EDITABLE,
+ 'callback' => [ $this, 'activate_module' ],
+ 'permission_callback' => function() {
+ return current_user_can( 'manage_options' );
+ },
+ 'args' => array(
+ 'slug' => array(
+ 'required' => true,
+ 'sanitize_callback' => 'sanitize_key',
+ ),
+ 'value' => array(
+ 'required' => true,
+ 'sanitize_callback' => 'rest_sanitize_boolean',
+ 'validate_callback' => 'rest_validate_request_arg',
+ ),
+ ),
+ ]
+ );
}
/**
@@ -324,6 +392,168 @@ public function get_plugin_state( \WP_REST_Request $request ) {
);
}
+ /**
+ * Activate a plugin via REST API.
+ *
+ * @param \WP_REST_Request> $request Request details.
+ *
+ * @return void
+ */
+ public function activate_plugin( $request ) {
+ $slug = $request->get_param( 'slug' );
+
+ if ( empty( $slug ) ) {
+ return;
+ }
+
+ $plugin_helper = new Plugin_Helper();
+ $path = $plugin_helper->get_plugin_path( $slug );
+
+ if ( ! file_exists( WP_PLUGIN_DIR . '/' . $path ) ) {
+ require_once ABSPATH . 'wp-admin/includes/file.php';
+ require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+ require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
+
+ /** @var object|\WP_Error $api */
+ $api = plugins_api(
+ 'plugin_information',
+ array(
+
+ 'slug' => $slug,
+ 'fields' => array( 'sections' => false ),
+ )
+ );
+
+ if ( is_wp_error( $api ) ) {
+ wp_send_json_error( array( 'message' => $api->get_error_message() ) );
+ }
+
+ if ( ! isset( $api->download_link ) ) {
+ wp_send_json_error( array( 'message' => __( 'Invalid action', 'neve' ) ) );
+ }
+
+ $skin = new \WP_Ajax_Upgrader_Skin();
+ $upgrader = new \Plugin_Upgrader( $skin );
+ $result = $upgrader->install( $api->download_link );
+
+ if ( is_wp_error( $result ) ) {
+ wp_send_json_error( array( 'message' => $result->get_error_message() ) );
+ }
+
+ if ( $skin->get_errors()->has_errors() && is_wp_error( $skin->result ) ) {
+ if ( 'folder_exists' !== $skin->result->get_error_code() ) {
+ wp_send_json_error( array( 'message' => $skin->result->get_error_message() ) );
+ }
+ }
+
+ if ( ! $result ) {
+ global $wp_filesystem;
+
+ $status = [
+ 'message' => __( 'Invalid action', 'neve' ),
+ ];
+
+ if ( $wp_filesystem instanceof \WP_Filesystem_Base && $wp_filesystem->errors->has_errors() ) {
+ $status['message'] = esc_html( $wp_filesystem->errors->get_error_message() );
+ }
+
+ wp_send_json_error( $status );
+ }
+ }
+
+ $result = activate_plugin( $path );
+
+ if ( is_wp_error( $result ) ) {
+ wp_send_json_error( array( 'message' => $result->get_error_message() ) );
+ }
+
+ wp_send_json_success( array( 'message' => __( 'Module Activated', 'neve' ) ) );
+ }
+
+ /**
+ * Activate Orbit Fox module.
+ *
+ * @param \WP_REST_Request> $request Request details.
+ * @return void
+ */
+ public function activate_module( $request ) {
+ $module_slug = $request->get_param( 'slug' );
+ $module_value = $request->get_param( 'value' );
+
+ if ( ! class_exists( 'Orbit_Fox_Global_Settings' ) ) {
+ wp_send_json_error( __( 'Invalid action', 'neve' ) );
+ }
+
+ $settings = new \Orbit_Fox_Global_Settings();
+ $modules = $settings::$instance->module_objects;
+
+ if ( ! isset( $modules[ $module_slug ] ) ) {
+ wp_send_json_error( __( 'Invalid action', 'neve' ) );
+ }
+
+ $response = $modules[ $module_slug ]->set_status( 'active', $module_value );
+
+ wp_send_json_success( $module_value ? __( 'Module Activated', 'neve' ) : __( 'Module Deactivated.', 'neve' ) );
+ }
+
+ /**
+ * Save launch progress state.
+ *
+ * @param \WP_REST_Request> $request The request object.
+ * @return \WP_REST_Response
+ */
+ public function save_launch_progress( $request ) {
+ $progress = $request->get_param( 'progress' );
+
+ if ( ! is_array( $progress ) ) {
+ return new \WP_REST_Response(
+ [
+ 'success' => false,
+ 'message' => 'Invalid progress data',
+ ],
+ 400
+ );
+ }
+
+ // Validate progress structure
+ $valid_keys = [ 'identity', 'content', 'performance' ];
+ foreach ( $valid_keys as $key ) {
+ if ( ! isset( $progress[ $key ] ) || ! is_array( $progress[ $key ] ) ) {
+ return new \WP_REST_Response(
+ [
+ 'success' => false,
+ 'message' => 'Invalid progress structure',
+ ],
+ 400
+ );
+ }
+
+ // Validate all values are booleans
+ foreach ( $progress[ $key ] as $value ) {
+ if ( ! is_bool( $value ) ) {
+ return new \WP_REST_Response(
+ [
+ 'success' => false,
+ 'message' => 'Progress values must be boolean',
+ ],
+ 400
+ );
+ }
+ }
+ }
+
+ // Save to option
+ update_option( 'neve_launch_progress', $progress, false );
+
+ return new \WP_REST_Response(
+ [
+ 'success' => true,
+ 'message' => 'Progress saved',
+ ],
+ 200
+ );
+ }
+
/**
* Drop `Background` submenu item.
*/
diff --git a/inc/core/core_loader.php b/inc/core/core_loader.php
index 3279533399..462bcceab9 100644
--- a/inc/core/core_loader.php
+++ b/inc/core/core_loader.php
@@ -97,6 +97,8 @@ private function define_modules() {
'Views\Content_None',
'Views\Content_404',
'Views\Breadcrumbs',
+ 'Views\Style_Book',
+ 'Views\Scroll_To_Top',
'Views\Layouts\Layout_Container',
'Views\Layouts\Layout_Sidebar',
diff --git a/inc/core/front_end.php b/inc/core/front_end.php
index aac92b9835..05232dc1d2 100644
--- a/inc/core/front_end.php
+++ b/inc/core/front_end.php
@@ -16,6 +16,7 @@
use Neve\Core\Settings\Mods;
use Neve\Core\Dynamic_Css;
use Neve\Core\Traits\Theme_Mods;
+use Neve\Customizer\Options\Scroll_To_Top;
/**
* Front end handler class.
@@ -86,6 +87,8 @@ public function setup_theme() {
add_filter( 'theme_mod_background_color', '__return_empty_string' );
$this->add_woo_support();
add_filter( 'neve_dynamic_style_output', array( $this, 'css_global_custom_colors' ), PHP_INT_MAX, 2 );
+
+ add_filter( 'neve_dynamic_style_output', array( $this, 'css_scroll_to_top' ), 99, 2 );
}
/**
@@ -462,9 +465,16 @@ private function add_scripts() {
}
if ( class_exists( 'WooCommerce', false ) && is_woocommerce() ) {
- wp_register_script( 'neve-shop-script', NEVE_ASSETS_URL . 'js/build/modern/shop.js', array(), NEVE_VERSION, true );
+ wp_register_script( 'neve-shop-script', NEVE_ASSETS_URL . 'js/build/modern/shop.js', array( 'jquery', 'wc-single-product' ), NEVE_VERSION, true );
wp_enqueue_script( 'neve-shop-script' );
wp_script_add_data( 'neve-shop-script', 'async', true );
+ wp_localize_script(
+ 'neve-shop-script',
+ 'neveShopSlider',
+ array(
+ 'isSparkActive' => is_plugin_active( 'sparks-for-woocommerce/sparks-for-woocommerce.php' ),
+ )
+ );
}
if ( $this->should_load_comments_reply() ) {
@@ -587,6 +597,9 @@ public function get_strings() {
'switch_skin' => __( 'Switch Skin', 'neve' ),
'dismiss' => __( 'Dismiss', 'neve' ),
'rollback' => __( 'Roll Back', 'neve' ),
+ 'scroll_to_top_desc' => __( 'Add a customizable scroll-to-top button that appears exactly when needed. Style it to match your brand.', 'neve' ),
+ /* translators: %s - Module name for the upsell */
+ 'upsell' => __( 'Unlock %s with the Pro version.', 'neve' ),
];
}
@@ -610,6 +623,89 @@ public function css_global_custom_colors( $current_styles, $context ) {
return $current_styles;
}
+ /**
+ * Add module css.
+ *
+ * @param string $css Current CSS style.
+ * @param string $context Current context.
+ *
+ * @return string Altered CSS.
+ */
+ public function css_scroll_to_top( $css, $context = 'frontend' ) {
+ if ( ! Scroll_To_Top::is_enabled() ) {
+ return $css;
+ }
+
+ if ( $context !== 'frontend' ) {
+ return $css;
+ }
+
+ $scroll_to_top_css = '.scroll-to-top {' . ( is_rtl() ? 'left: 20px;' : 'right: 20px;' ) . '
+ border: none;
+ position: fixed;
+ bottom: 30px;
+ display: none;
+ opacity: 0;
+ visibility: hidden;
+ transition: opacity 0.3s ease-in-out, visibility 0.3s ease-in-out;
+ align-items: center;
+ justify-content: center;
+ z-index: 999;
+ }
+ @supports (-webkit-overflow-scrolling: touch) {
+ .scroll-to-top {
+ bottom: 74px;
+ }
+ }
+ .scroll-to-top.image {
+ background-position: center;
+ }
+ .scroll-to-top .scroll-to-top-image {
+ width: 100%;
+ height: 100%;
+ }
+ .scroll-to-top .scroll-to-top-label {
+ margin: 0;
+ padding: 5px;
+ }
+ .scroll-to-top:hover {
+ text-decoration: none;
+ }
+ .scroll-to-top.scroll-to-top-left {' . ( is_rtl() ? 'right: 20px; left: unset;' : 'left: 20px; right: unset;' ) . '}
+ .scroll-to-top.scroll-show-mobile {
+ display: flex;
+ }
+ @media (min-width: 960px) {
+ .scroll-to-top {
+ display: flex;
+ }
+ }';
+
+ $scroll_to_top_css .= '.scroll-to-top {
+ color: var(--color);
+ padding: var(--padding);
+ border-radius: var(--borderradius);
+ background: var(--bgcolor);
+ }
+
+ .scroll-to-top:hover, .scroll-to-top:focus {
+ color: var(--hovercolor);
+ background: var(--hoverbgcolor);
+ }
+
+ .scroll-to-top-icon, .scroll-to-top.image .scroll-to-top-image {
+ width: var(--size);
+ height: var(--size);
+ }
+
+ .scroll-to-top-image {
+ background-image: var(--bgimage);
+ background-size: cover;
+ }';
+
+ return $css . $scroll_to_top_css;
+ }
+
/**
* Fix script translations language directory.
*
diff --git a/inc/core/settings/config.php b/inc/core/settings/config.php
index b3b9b5db6a..ab5ba5369a 100644
--- a/inc/core/settings/config.php
+++ b/inc/core/settings/config.php
@@ -94,6 +94,7 @@ class Config {
const MODS_POST_TYPE_VSPACING = 'content_vspacing';
const OPTION_LOCAL_GOOGLE_FONTS_HOSTING = 'nv_pro_enable_local_fonts';
+ const MODS_PRELOAD_FONTS = 'neve_preload_fonts';
const OPTION_POSTS_PER_PAGE = 'posts_per_page';
const MODS_TPOGRAPHY_FONT_PAIRS = 'neve_font_pairs';
diff --git a/inc/core/styles/frontend.php b/inc/core/styles/frontend.php
index 84a56509dd..f355571d94 100644
--- a/inc/core/styles/frontend.php
+++ b/inc/core/styles/frontend.php
@@ -9,8 +9,10 @@
use Neve\Core\Settings\Config;
use Neve\Core\Settings\Mods;
+use Neve\Core\Styles\Css_Prop;
use Neve\Customizer\Defaults\Layout;
use Neve\Customizer\Defaults\Single_Post;
+use Neve\Customizer\Options\Scroll_To_Top;
/**
* Class Generator for Frontend.
@@ -54,6 +56,7 @@ public function __construct() {
$this->setup_header_style();
$this->setup_single_post_style();
$this->setup_content_vspacing();
+ $this->setup_scroll_to_top();
}
/**
@@ -1058,4 +1061,108 @@ private function setup_content_vspacing() {
];
}
}
+
+ /**
+ * Setup scroll to top styles.
+ *
+ * @return void
+ */
+ private function setup_scroll_to_top() {
+ if ( ! Scroll_To_Top::is_enabled() ) {
+ return;
+ }
+
+ // Add CSS variables to root
+ $rules = $this->get_scroll_to_top_rules();
+ $this->_subscribers[] = [
+ Dynamic_Selector::KEY_SELECTOR => '.scroll-to-top',
+ Dynamic_Selector::KEY_RULES => $rules,
+ ];
+ }
+
+ /**
+ * Get scroll to top CSS variables rules.
+ *
+ * @return array>
+ */
+ private function get_scroll_to_top_rules() {
+ $rules = [
+ '--color' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_icon_color',
+ Dynamic_Selector::META_DEFAULT => empty( Mods::get( 'neve_scroll_to_top_icon_color', 'var(--nv-text-dark-bg)' ) ) ? 'transparent' : 'var(--nv-text-dark-bg)',
+ ],
+ '--padding' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_padding',
+ Dynamic_Selector::META_IS_RESPONSIVE => true,
+ Dynamic_Selector::META_SUFFIX => 'responsive_unit',
+ 'directional-prop' => Config::CSS_PROP_PADDING,
+ Dynamic_Selector::META_DEFAULT => array(
+ 'desktop' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'tablet' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'mobile' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'desktop-unit' => 'px',
+ 'tablet-unit' => 'px',
+ 'mobile-unit' => 'px',
+ ),
+ ],
+ '--borderradius' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_border_radius',
+ Dynamic_Selector::META_DEFAULT => 3,
+ Dynamic_Selector::META_SUFFIX => 'px',
+ ],
+ '--bgcolor' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_background_color',
+ Dynamic_Selector::META_DEFAULT => empty( Mods::get( 'neve_scroll_to_top_background_color', 'var(--nv-primary-accent)' ) ) ? 'transparent' : 'var(--nv-primary-accent)',
+ ],
+ '--hovercolor' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_icon_hover_color',
+ Dynamic_Selector::META_DEFAULT => empty( Mods::get( 'neve_scroll_to_top_icon_hover_color', 'var(--nv-text-dark-bg)' ) ) ? 'transparent' : 'var(--nv-text-dark-bg)',
+ ],
+ '--hoverbgcolor' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_background_hover_color',
+ Dynamic_Selector::META_DEFAULT => empty( Mods::get( 'neve_scroll_to_top_background_hover_color', 'var(--nv-primary-accent)' ) ) ? 'transparent' : 'var(--nv-primary-accent)',
+ ],
+ '--size' => [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_icon_size',
+ Dynamic_Selector::META_DEFAULT => '{ "mobile": "16", "tablet": "16", "desktop": "16" }',
+ Dynamic_Selector::META_IS_RESPONSIVE => true,
+ Dynamic_Selector::META_FILTER => function ( $css_prop, $value, $meta, $device ) {
+ $value = (int) $value;
+ if ( $value > 0 ) {
+ $unit_suffix = Css_Prop::get_suffix_responsive( $meta, $device );
+ return sprintf( '%s:%s;', $css_prop, $value . $unit_suffix );
+ }
+ return '';
+ },
+ ],
+ ];
+
+ $type = Mods::get( 'neve_scroll_to_top_type', 'icon' );
+
+ if ( $type === 'image' ) {
+ $rules['--bgimage'] = [
+ Dynamic_Selector::META_KEY => 'neve_scroll_to_top_image',
+ Dynamic_Selector::META_FILTER => function ( $css_prop, $value, $meta, $device ) {
+ return sprintf( '--bgimage:url(%s);', wp_get_attachment_url( $value ) );
+ },
+ ];
+ }
+
+ return $rules;
+ }
}
diff --git a/inc/customizer/loader.php b/inc/customizer/loader.php
index 605ad804d2..4d6267813c 100644
--- a/inc/customizer/loader.php
+++ b/inc/customizer/loader.php
@@ -83,6 +83,7 @@ private function define_modules() {
'Customizer\Options\Layout_Single_Page',
'Customizer\Options\Layout_Single_Product',
'Customizer\Options\Layout_Sidebar',
+ 'Customizer\Options\Scroll_To_Top',
'Customizer\Options\Typography',
'Customizer\Options\Colors_Background',
'Customizer\Options\Checkout',
@@ -144,6 +145,9 @@ public function enqueue_customizer_controls() {
'learnMore' => apply_filters( 'neve_external_link', 'https://docs.themeisle.com/article/1349-how-to-load-neve-fonts-locally', esc_html__( 'Learn more', 'neve' ) ),
'key' => Config::OPTION_LOCAL_GOOGLE_FONTS_HOSTING,
),
+ 'preloadFonts' => array(
+ 'key' => Config::MODS_PRELOAD_FONTS,
+ ),
'fontPairs' => get_theme_mod( Config::MODS_TPOGRAPHY_FONT_PAIRS, Config::$typography_default_pairs ),
'allowedGlobalCustomColor' => Colors_Background::CUSTOM_COLOR_LIMIT,
'constants' => [
@@ -291,6 +295,14 @@ public function register_setting_local_gf( $wp_customize ) {
'default' => false,
]
);
+
+ $wp_customize->add_setting(
+ Config::MODS_PRELOAD_FONTS,
+ [
+ 'sanitize_callback' => 'neve_sanitize_checkbox',
+ 'default' => false,
+ ]
+ );
}
/**
diff --git a/inc/customizer/options/scroll_to_top.php b/inc/customizer/options/scroll_to_top.php
new file mode 100644
index 0000000000..790f007bb0
--- /dev/null
+++ b/inc/customizer/options/scroll_to_top.php
@@ -0,0 +1,762 @@
+
+ * Created on: 2019-02-06
+ *
+ * @package Neve Pro Addon
+ */
+
+namespace Neve\Customizer\Options;
+
+use Neve\Customizer\Base_Customizer;
+use Neve\Customizer\Types\Control;
+use Neve\Customizer\Types\Section;
+
+/**
+ * Class Scroll_To_Top
+ *
+ * @package Neve_Pro\Customizer\Options
+ */
+class Scroll_To_Top extends Base_Customizer {
+ /**
+ * The minimum value of some customizer controls is 0 to able to allow usability relative to CSS units.
+ * That can be removed after the https://github.com/Codeinwp/neve/issues/3609 issue is handled.
+ *
+ * That is defined here against the usage of old Neve versions, Base_Customizer class of the stable Neve version already has the RELATIVE_CSS_UNIT_SUPPORTED_MIN_VALUE constant.
+ */
+ const RELATIVE_CSS_UNIT_SUPPORTED_MIN_VALUE = 0;
+
+ /**
+ * Base initialization.
+ *
+ * @return void
+ */
+ public function init() {
+ parent::init();
+ add_action( 'wp_head', array( $this, 'live_refresh_scripts' ) );
+ }
+
+ /**
+ * Live refresh for scroll to top controls.
+ *
+ * @return void
+ */
+ public function live_refresh_scripts() {
+ if ( ! is_customize_preview() ) {
+ return;
+ }
+ ?>
+
+ scroll_to_top_section();
+ $this->scroll_to_top_options();
+ $this->scroll_to_top_style_controls();
+ }
+
+ /**
+ * Register customizer section for the module
+ *
+ * @return void
+ */
+ private function scroll_to_top_section() {
+ $this->add_section(
+ new Section(
+ 'neve_scroll_to_top',
+ array(
+ 'priority' => 80,
+ 'title' => esc_html__( 'Scroll To Top', 'neve' ),
+ 'panel' => 'neve_layout',
+ )
+ )
+ );
+
+ }
+
+ /**
+ * Register option toggle in customizer
+ *
+ * @return void
+ */
+ private function scroll_to_top_options() {
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_status',
+ array(
+ 'sanitize_callback' => array( $this, 'sanitize_module_status' ),
+ 'default' => '1',
+ ),
+ array(
+ 'label' => esc_html__( 'Enable', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'type' => 'neve_toggle_control',
+ 'priority' => 5,
+ )
+ )
+ );
+
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_general',
+ array(
+ 'sanitize_callback' => 'sanitize_text_field',
+ ),
+ array(
+ 'label' => esc_html__( 'General', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 10,
+ 'class' => 'scroll-to-top-general',
+ 'accordion' => true,
+ 'expanded' => true,
+ 'controls_to_wrap' => 6,
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ 'Neve\Customizer\Controls\Heading'
+ )
+ );
+
+ /**
+ * Button side
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_side',
+ array(
+ 'default' => 'right',
+ 'sanitize_callback' => array( $this, 'sanitize_scroll_to_top_side' ),
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => esc_html__( 'Choose Side', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 20,
+ 'type' => 'select',
+ 'choices' => array(
+ 'left' => esc_html__( 'Left', 'neve' ),
+ 'right' => esc_html__( 'Right', 'neve' ),
+ ),
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ )
+ )
+ );
+
+ /**
+ * Scroll to top type
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_type',
+ array(
+ 'default' => 'icon',
+ 'sanitize_callback' => array( $this, 'sanitize_scroll_to_top_type' ),
+ ),
+ array(
+ 'label' => esc_html__( 'Type', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 30,
+ 'type' => 'select',
+ 'choices' => array(
+ 'icon' => esc_html__( 'Icon', 'neve' ),
+ 'image' => esc_html__( 'Image', 'neve' ),
+ ),
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ )
+ )
+ );
+
+ /**
+ * Scroll to top icon
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_icon',
+ array(
+ 'sanitize_callback' => 'wp_filter_nohtml_kses',
+ 'default' => 'stt-icon-style-1',
+ ),
+ array(
+ 'label' => esc_html__( 'Icon', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 35,
+ 'active_callback' => array( $this, 'is_icon_type_control' ),
+ 'is_for' => 'scroll_to_top',
+ 'large_buttons' => false,
+ 'type' => 'neve_radio_buttons_control',
+ ),
+ '\Neve\Customizer\Controls\React\Radio_Buttons'
+ )
+ );
+
+ /**
+ * Image button
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_image',
+ array(
+ 'sanitize_callback' => 'absint',
+ ),
+ array(
+ 'label' => esc_html__( 'Image', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 40,
+ 'active_callback' => array( $this, 'is_image_type_control' ),
+ 'flex_height' => true,
+ 'flex_width' => true,
+ ),
+ '\WP_Customize_Cropped_Image_Control'
+ )
+ );
+
+ /*
+ * Label
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_label',
+ array(
+ 'sanitize_callback' => 'sanitize_text_field',
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'priority' => 50,
+ 'section' => 'neve_scroll_to_top',
+ 'label' => esc_html__( 'Label', 'neve' ),
+ 'type' => 'text',
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ )
+ )
+ );
+
+ /**
+ * Offset
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_offset',
+ array(
+ 'sanitize_callback' => 'absint',
+ 'default' => 0,
+ ),
+ array(
+ 'label' => esc_html__( 'Offset (px)', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'step' => 1,
+ 'input_attr' => array(
+ 'min' => 0,
+ 'max' => 1000,
+ 'default' => 0,
+ ),
+ 'input_attrs' => array(
+ 'min' => 0,
+ 'max' => 1000,
+ 'defaultVal' => 0,
+ ),
+ 'priority' => 60,
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ class_exists( 'Neve\Customizer\Controls\React\Range' ) ? 'Neve\Customizer\Controls\React\Range' : 'Neve\Customizer\Controls\Range'
+ )
+ );
+
+ /**
+ * Hide on mobile
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_on_mobile',
+ array(
+ 'sanitize_callback' => 'neve_sanitize_checkbox',
+ 'default' => false,
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => esc_html__( 'Hide on mobile', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'type' => 'neve_toggle_control',
+ 'priority' => 70,
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ 'Neve\Customizer\Controls\Checkbox'
+ )
+ );
+ }
+
+ /**
+ * Add style controls for Scroll to top module.
+ *
+ * @return void
+ */
+ private function scroll_to_top_style_controls() {
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_style',
+ array(
+ 'sanitize_callback' => 'sanitize_text_field',
+ ),
+ array(
+ 'label' => esc_html__( 'Style', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 80,
+ 'class' => 'scroll-to-top-accordion',
+ 'accordion' => true,
+ 'expanded' => false,
+ 'controls_to_wrap' => 3,
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ 'Neve\Customizer\Controls\Heading'
+ )
+ );
+
+ $default_padding_values = array(
+ 'desktop' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'tablet' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'mobile' => array(
+ 'top' => 8,
+ 'right' => 10,
+ 'bottom' => 8,
+ 'left' => 10,
+ ),
+ 'desktop-unit' => 'px',
+ 'tablet-unit' => 'px',
+ 'mobile-unit' => 'px',
+ );
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_padding',
+ array(
+ 'default' => $default_padding_values,
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => __( 'Padding', 'neve' ),
+ 'sanitize_callback' => array( $this, 'sanitize_spacing_array' ),
+ 'section' => 'neve_scroll_to_top',
+ 'input_attrs' => array(
+ 'units' => array( 'px', 'em', 'rem' ),
+ ),
+ 'default' => $default_padding_values,
+ 'priority' => 90,
+ 'live_refresh_selector' => true,
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--padding',
+ 'selector' => '#scroll-to-top',
+ 'responsive' => true,
+ ),
+ 'responsive' => true,
+ 'directional' => true,
+ 'template' =>
+ '#scroll-to-top {
+ padding-top: {{value.top}};
+ padding-right: {{value.right}};
+ padding-bottom: {{value.bottom}};
+ padding-left: {{value.left}};
+ }',
+ ),
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ '\Neve\Customizer\Controls\React\Spacing'
+ )
+ );
+
+ /**
+ * Icon size
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_icon_size',
+ array(
+ 'sanitize_callback' => 'neve_sanitize_range_value',
+ 'default' => '{ "mobile": "16", "tablet": "16", "desktop": "16" }',
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => esc_html__( 'Icon Size', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'media_query' => true,
+ 'step' => 1,
+ 'input_attr' => array(
+ 'mobile' => array(
+ 'min' => 10,
+ 'max' => 100,
+ 'default' => 16,
+ ),
+ 'tablet' => array(
+ 'min' => 10,
+ 'max' => 100,
+ 'default' => 16,
+ ),
+ 'desktop' => array(
+ 'min' => 10,
+ 'max' => 100,
+ 'default' => 16,
+ ),
+ ),
+ 'input_attrs' => array(
+ 'step' => 1,
+ 'min' => self::RELATIVE_CSS_UNIT_SUPPORTED_MIN_VALUE,
+ 'max' => 100,
+ 'defaultVal' => array(
+ 'mobile' => 16,
+ 'tablet' => 16,
+ 'desktop' => 16,
+ 'suffix' => [
+ 'mobile' => 'px',
+ 'tablet' => 'px',
+ 'desktop' => 'px',
+ ],
+ ),
+ 'units' => array( 'px', 'em', 'rem' ),
+ ),
+ 'priority' => 100,
+ 'live_refresh_selector' => true,
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--size',
+ 'selector' => '.scroll-to-top-icon, .scroll-to-top-image',
+ 'responsive' => true,
+ 'suffix' => 'px',
+ ),
+ 'responsive' => true,
+ 'template' => 'body .scroll-to-top.icon .scroll-to-top-icon, body .scroll-to-top.image .scroll-to-top-image {
+ width: {{value}}px;
+ height: {{value}}px;
+ }',
+ ),
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ class_exists( 'Neve\Customizer\Controls\React\Responsive_Range', false ) ? 'Neve\Customizer\Controls\React\Responsive_Range' : 'Neve\Customizer\Controls\Range'
+ )
+ );
+
+ /**
+ * Button border radius
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_border_radius',
+ array(
+ 'sanitize_callback' => 'absint',
+ 'default' => 3,
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => esc_html__( 'Border Radius', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'step' => 1,
+ 'input_attr' => array(
+ 'min' => 0,
+ 'max' => 200,
+ 'default' => 3,
+ ),
+ 'input_attrs' => array(
+ 'min' => 0,
+ 'max' => 200,
+ 'defaultVal' => 3,
+ ),
+ 'priority' => 110,
+ 'live_refresh_selector' => true,
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'fallback' => '0',
+ 'vars' => '--borderradius',
+ 'selector' => '.scroll-to-top',
+ 'suffix' => 'px',
+ ),
+ 'template' => 'body .scroll-to-top {
+ border-radius: {{value}}px;
+ }',
+ 'fallback' => '0',
+ ),
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ class_exists( 'Neve\Customizer\Controls\React\Range' ) ? 'Neve\Customizer\Controls\React\Range' : 'Neve\Customizer\Controls\Range'
+ )
+ );
+
+ /**
+ * Colors heading
+ */
+ $this->add_control(
+ new Control(
+ 'neve_scroll_to_top_colors',
+ array(
+ 'sanitize_callback' => 'sanitize_text_field',
+ ),
+ array(
+ 'label' => esc_html__( 'Color', 'neve' ),
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => 110,
+ 'class' => 'scroll-top-colors-accordion',
+ 'accordion' => true,
+ 'expanded' => false,
+ 'controls_to_wrap' => 4,
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ 'Neve\Customizer\Controls\Heading'
+ )
+ );
+
+ $color_controls = array(
+ 'neve_scroll_to_top_icon_color' => array(
+ 'default' => 'var(--nv-text-dark-bg)',
+ 'priority' => 120,
+ 'label' => esc_html__( 'Color', 'neve' ),
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--color',
+ 'selector' => '.scroll-to-top',
+ ),
+ 'template' => '
+ body .scroll-to-top {
+ color: {{value}};
+ }',
+ ),
+ ),
+ 'neve_scroll_to_top_icon_hover_color' => array(
+ 'default' => 'var(--nv-text-dark-bg)',
+ 'priority' => 130,
+ 'label' => esc_html__( 'Hover Color', 'neve' ),
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--hovercolor',
+ 'selector' => '.scroll-to-top:hover',
+ ),
+ 'template' => '
+ body .scroll-to-top:hover {
+ color: {{value}};
+ }',
+ ),
+ ),
+ 'neve_scroll_to_top_background_color' => array(
+ 'default' => 'var(--nv-primary-accent)',
+ 'priority' => 140,
+ 'label' => esc_html__( 'Background Color', 'neve' ),
+ 'input_attrs' => [
+ 'allow_gradient' => true,
+ ],
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--bgcolor',
+ 'selector' => '.scroll-to-top',
+ ),
+ 'template' => '
+ body .scroll-to-top {
+ background: {{value}};
+ }',
+ ),
+ ),
+ 'neve_scroll_to_top_background_hover_color' => array(
+ 'default' => 'var(--nv-primary-accent)',
+ 'priority' => 150,
+ 'label' => esc_html__( 'Background Hover Color', 'neve' ),
+ 'input_attrs' => [
+ 'allow_gradient' => true,
+ ],
+ 'live_refresh_css_prop' => array(
+ 'cssVar' => array(
+ 'vars' => '--hoverbgcolor',
+ 'selector' => '.scroll-to-top:hover',
+ ),
+ 'template' => '
+ body .scroll-to-top:hover {
+ background: {{value}};
+ }',
+ ),
+ ),
+ );
+
+ /**
+ * Color controls
+ */
+ foreach ( $color_controls as $control_id => $control_properties ) {
+ $this->add_control(
+ new Control(
+ $control_id,
+ array(
+ 'sanitize_callback' => 'neve_sanitize_colors',
+ 'default' => $control_properties['default'],
+ 'transport' => $this->selective_refresh,
+ ),
+ array(
+ 'label' => $control_properties['label'],
+ 'section' => 'neve_scroll_to_top',
+ 'priority' => $control_properties['priority'],
+ 'input_attrs' => isset( $control_properties['input_attrs'] ) ? $control_properties['input_attrs'] : [],
+ 'live_refresh_selector' => true,
+ 'live_refresh_css_prop' => $control_properties['live_refresh_css_prop'],
+ 'active_callback' => array( $this, 'is_module_enabled' ),
+ ),
+ '\Neve\Customizer\Controls\React\Color'
+ )
+ );
+ }
+ }
+
+ /**
+ * Active callback for controls that are available only if scroll to top is an image
+ *
+ * @return bool
+ */
+ public function is_image_type_control() {
+ if ( ! $this->is_module_enabled() ) {
+ return false;
+ }
+
+ return get_theme_mod( 'neve_scroll_to_top_type', 'icon' ) === 'image';
+ }
+
+ /**
+ * Active callback for controls that are available only if scroll to top is an icon
+ *
+ * @return bool
+ */
+ public function is_icon_type_control() {
+ if ( ! $this->is_module_enabled() ) {
+ return false;
+ }
+
+ return get_theme_mod( 'neve_scroll_to_top_type', 'icon' ) === 'icon';
+ }
+
+ /**
+ * Sanitize scroll to top type
+ *
+ * @param string $value - value of the control.
+ *
+ * @return string
+ */
+ public function sanitize_scroll_to_top_type( $value ) {
+ $allowed_values = array( 'icon', 'image' );
+ if ( ! in_array( $value, $allowed_values, true ) ) {
+ return 'icon';
+ }
+
+ return esc_html( $value );
+ }
+
+ /**
+ * Sanitize scroll to top side
+ *
+ * @param string $value - value of the control.
+ *
+ * @return string
+ */
+ public function sanitize_scroll_to_top_side( $value ) {
+ $allowed_values = array( 'left', 'right' );
+ if ( ! in_array( $value, $allowed_values, true ) ) {
+ return 'right';
+ }
+
+ return esc_html( $value );
+ }
+
+ /**
+ * Check if Scroll to Top is enabled.
+ *
+ * @return bool
+ */
+ public static function is_enabled() {
+ // Check old option first for backward compatibility.
+ $old_value = get_option( 'nv_pro_scroll_to_top_status', null );
+ $is_enabled = false;
+
+ if ( null !== $old_value ) {
+ // Option exists — use it and migrate to the new theme_mod for future.
+ $is_enabled = $old_value === '1';
+
+ set_theme_mod( 'neve_scroll_to_top_status', $old_value );
+ delete_option( 'nv_pro_scroll_to_top_status' );
+ } else {
+ // Otherwise, use the new theme_mod.
+ $is_enabled = get_theme_mod( 'neve_scroll_to_top_status', '1' ) === '1';
+ }
+
+ /**
+ * Filter to allow conditional loading of the scroll to top feature.
+ *
+ * @param bool $is_enabled Whether the scroll to top feature is enabled.
+ */
+ return apply_filters( 'neve_scroll_to_top_is_enabled', $is_enabled );
+ }
+
+ /**
+ * Active callback for scroll to top controls.
+ *
+ * @return bool
+ */
+ public function is_module_enabled() {
+ return self::is_enabled();
+ }
+
+ /**
+ * Sanitize module status. The toggle in neve options returns '1' or '' so our control should return the same thing.
+ *
+ * @param bool|string $value Current value.
+ *
+ * @return string
+ */
+ public function sanitize_module_status( $value ) {
+ if ( $value === true ) {
+ return '1';
+ }
+ if ( $value === false ) {
+ return '';
+ }
+ return $value;
+ }
+
+}
diff --git a/inc/customizer/options/upsells.php b/inc/customizer/options/upsells.php
index 768b876672..668f5d3168 100644
--- a/inc/customizer/options/upsells.php
+++ b/inc/customizer/options/upsells.php
@@ -28,13 +28,6 @@ class Upsells extends Base_Customizer {
*/
private $upsell_url = '';
- /**
- * Scroll to top upsell url
- *
- * @var string
- */
- private $stt_upsell_url = '';
-
/**
* Init function
*
@@ -45,8 +38,7 @@ public function init() {
return;
}
- $this->stt_upsell_url = esc_url_raw( apply_filters( 'neve_upgrade_link_from_child_theme_filter', $this->get_upgrade_url( 'scrolltotop' ) ) );
- $this->upsell_url = esc_url_raw( apply_filters( 'neve_upgrade_link_from_child_theme_filter', $this->get_upgrade_url( 'learnmorebtn' ) ) );
+ $this->upsell_url = esc_url_raw( apply_filters( 'neve_upgrade_link_from_child_theme_filter', $this->get_upgrade_url( 'learnmorebtn' ) ) );
parent::init();
@@ -408,20 +400,6 @@ private function section_upsells() {
)
);
}
-
- $this->add_section(
- new Section(
- 'neve_scroll_to_top_upsell',
- array(
- 'priority' => 80,
- 'title' => esc_html__( 'Scroll To Top', 'neve' ),
- 'cta' => esc_html__( 'PRO', 'neve' ),
- 'url' => $this->stt_upsell_url,
- 'panel' => 'neve_layout',
- ),
- 'Neve\Customizer\Controls\React\Upsell_Section'
- )
- );
}
/**
@@ -443,30 +421,6 @@ private function control_upsells() {
)
);
-
- /*
- * Deactivated.
- *
- * @since 4.1.0
- */
- $this->add_control(
- new Control(
- 'neve_scroll_to_top_cta_control',
- [ 'sanitize_callback' => 'sanitize_text_field' ],
- [
- /* translators: Module name for the upsell. */
- 'text' => sprintf( __( 'Unlock %s with the Pro version.', 'neve' ), __( 'Scroll To Top', 'neve' ) ),
- 'button_text' => esc_html__( 'Get the PRO version!', 'neve' ),
- 'section' => 'neve_scroll_to_top_upsell',
- 'priority' => PHP_INT_MIN,
- 'link' => $this->get_upgrade_url( 'scrolltotop' ),
- 'class' => 'column-layout',
- 'use_primary' => 'true',
- ],
- 'Neve\Customizer\Controls\Simple_Upsell'
- )
- );
-
$hfg_header = 'hfg_header';
$hfg_footer = 'hfg_footer';
diff --git a/inc/views/font_manager.php b/inc/views/font_manager.php
index cc9d8b36d3..46769b35d3 100644
--- a/inc/views/font_manager.php
+++ b/inc/views/font_manager.php
@@ -93,6 +93,7 @@ public function init() {
add_action( 'enqueue_block_editor_assets', array( $this, 'register_google_fonts' ), 200 );
add_action( 'enqueue_block_editor_assets', array( $this, 'do_editor_styles_google_fonts' ), 210 );
add_action( 'wp_print_styles', array( $this, 'load_external_fonts_locally' ), PHP_INT_MAX );
+ add_filter( 'style_loader_tag', array( $this, 'add_rel_preload' ), 10, 2 );
}
/**
@@ -251,6 +252,46 @@ private function enqueue_google_font( $font, $weights = [], $skip_enqueue = fals
wp_enqueue_style( 'neve-google-font-' . str_replace( ' ', '-', strtolower( $font ) ), $url, array(), NEVE_VERSION );
}
+ /**
+ * Add onload, rel and as attributes for Google Font stylesheets.
+ * Implements lazy loading with preload for better performance.
+ *
+ * @param string $html Current html code.
+ * @param string $handle Current script handle.
+ *
+ * @return string
+ */
+ public function add_rel_preload( $html, $handle ) {
+ if ( is_admin() ) {
+ return $html;
+ }
+
+ $preload_enabled = get_theme_mod( Config::MODS_PRELOAD_FONTS, false );
+
+ /**
+ * Filters whether fonts should be preloaded.
+ *
+ * @param bool $preload_enabled Whether fonts should be preloaded. Default value is false.
+ *
+ * @since 3.9.0
+ */
+ $should_preload = apply_filters( 'neve_preload_fonts', $preload_enabled );
+
+ if ( ! (bool) $should_preload ) {
+ return $html;
+ }
+
+ // Only preload Google Font stylesheets
+ if ( strpos( $handle, 'neve-google-font-' ) === 0 ) {
+ // Lazy load with JS, but also add noscript in case no JS
+ $no_script = '' . $html . ' ';
+ // Add onload, rel="preload", as="style", and put together with noscript
+ $html = str_replace( 'rel=\'stylesheet\'', 'rel="preload" as="style" onload="this.rel=\'stylesheet\';"', $html ) . $no_script;
+ }
+
+ return $html;
+ }
+
/**
* Load Google Fonts locally.
*
diff --git a/inc/views/scroll_to_top.php b/inc/views/scroll_to_top.php
new file mode 100644
index 0000000000..9eb007fe6d
--- /dev/null
+++ b/inc/views/scroll_to_top.php
@@ -0,0 +1,189 @@
+';
+
+ // We use 2 `amp-animation` elements to trigger the visibility of the button. The first one is for making the button visible
+ echo '
+
+
+ ';
+
+ echo '
+
+
+
+
+ ';
+ }
+
+ /**
+ * Enqueue module scripts
+ *
+ * @return void
+ */
+ public function enqueue_scripts() {
+ if ( ! Scroll_To_Top_Options::is_enabled() ) {
+ return;
+ }
+
+ if ( neve_is_amp() ) {
+ return;
+ }
+
+ wp_register_script(
+ 'neve-scroll-to-top',
+ NEVE_ASSETS_URL . 'js/build/modern/scroll-to-top.js',
+ array(),
+ NEVE_VERSION,
+ true
+ );
+
+ wp_enqueue_script( 'neve-scroll-to-top' );
+
+ wp_script_add_data( 'neve-scroll-to-top', 'async', true );
+
+ wp_localize_script( 'neve-scroll-to-top', 'neveScrollOffset', $this->localize_scroll() );
+ }
+
+ /**
+ * Send offset to the JS object
+ *
+ * @return array
+ */
+ private function localize_scroll() {
+ return array(
+ 'offset' => get_theme_mod( 'neve_scroll_to_top_offset', 0 ),
+ );
+ }
+
+ /**
+ * Display scroll to top button
+ *
+ * @return void
+ */
+ public function render_button() {
+ if ( ! Scroll_To_Top_Options::is_enabled() ) {
+ return;
+ }
+
+ $position = get_theme_mod( 'neve_scroll_to_top_side', 'right' );
+ $hide_on_mobile = get_theme_mod( 'neve_scroll_to_top_on_mobile', false );
+ $type = get_theme_mod( 'neve_scroll_to_top_type', 'icon' );
+ $label = get_theme_mod( 'neve_scroll_to_top_label' );
+ $image = get_theme_mod( 'neve_scroll_to_top_image' );
+ $icon = get_theme_mod( 'neve_scroll_to_top_icon', 'stt-icon-style-1' );
+
+ $extra_class = sprintf( 'scroll-to-top-%s %s', $position, ( ( ! $hide_on_mobile ) ? ' scroll-show-mobile ' : '' ) );
+ $extra_class .= $type;
+
+ $amp = neve_is_amp() ? 'on="tap:neve_body.scrollTo(duration=200)"' : '';
+
+ echo '';
+ }
+
+ /**
+ * Get SVG icon for scroll to top button.
+ *
+ * @param string $icon_style The icon style identifier.
+ * @return string SVG icon markup.
+ */
+ private function get_icon_svg( $icon_style ) {
+ $icons = array(
+ 'stt-icon-style-1' => '
+
+
+
+
+
+
+
+
+
+
+ $color_data ) : ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ 'neve_h1_accordion_wrap',
+ 2 => 'neve_h2_accordion_wrap',
+ 3 => 'neve_h3_accordion_wrap',
+ 4 => 'neve_h4_accordion_wrap',
+ 5 => 'neve_h5_accordion_wrap',
+ 6 => 'neve_h6_accordion_wrap',
+ ];
+
+ foreach ( $headings as $level => $control_id ) :
+ ?>
+ class="builder-item-focus" data-section="" data-control="">
+
+ >
+
+
+
+
+
+
+ get( 'Description' ) ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+