| @@ -190,13 +190,39 @@ | ||
| 190 | 190 | if ( ! empty( $element['category'] ) ) { |
| 191 | 191 | try { |
| 192 | 192 | $widget = false; |
| 193 | 193 | $import = apply_filters( 'rtsb_import_status', false ); |
| 194 | - | |
| 195 | - if ( $this->should_register_widget( $element['category'], $import ) ) { | |
| 196 | - $widget = new $element['base_class'](); | |
| 194 | + switch ( $element['category'] ) { | |
| 195 | + case 'product': | |
| 196 | + if ( BuilderFns::is_product() || $import ) { | |
| 197 | + $widget = new $element['base_class'](); | |
| 198 | + } | |
| 199 | + break; | |
| 200 | + case 'shop': | |
| 201 | + if ( BuilderFns::is_archive() || BuilderFns::is_shop() || $import ) { | |
| 202 | + $widget = new $element['base_class'](); | |
| 203 | + } | |
| 204 | + break; | |
| 205 | + case 'archive': | |
| 206 | + if ( BuilderFns::is_archive() || $import ) { | |
| 207 | + $widget = new $element['base_class'](); | |
| 208 | + } | |
| 209 | + break; | |
| 210 | + case 'cart': | |
| 211 | + if ( BuilderFns::is_cart() || $import ) { | |
| 212 | + $widget = new $element['base_class'](); | |
| 213 | + } | |
| 214 | + break; | |
| 215 | + case 'checkout': | |
| 216 | + if ( BuilderFns::is_checkout() || $import ) { | |
| 217 | + $widget = new $element['base_class'](); | |
| 218 | + } | |
| 219 | + break; | |
| 220 | + case 'general': | |
| 221 | + $widget = new $element['base_class'](); | |
| 222 | + break; | |
| 223 | + default: | |
| 197 | 224 | } |
| 198 | - | |
| 199 | 225 | $widget = apply_filters( 'rtsb/element/list/init/widgets', $widget, $element ); |
| 200 | 226 | |
| 201 | 227 | if ( $widget && is_object( $widget ) ) { |
| 202 | 228 | $widgets_manager->register( $widget ); |
| @@ -209,48 +235,8 @@ | ||
| 209 | 235 | } |
| 210 | 236 | } |
| 211 | 237 | |
| 212 | 238 | /** |
| 213 | - * Determine whether a widget for the given category should be registered | |
| 214 | - * in the current request context. | |
| 215 | - * | |
| 216 | - * @param string $category Element category. | |
| 217 | - * @param bool $import Whether an import is in progress. | |
| 218 | - * | |
| 219 | - * @return bool | |
| 220 | - */ | |
| 221 | - protected function should_register_widget( $category, $import ) { | |
| 222 | - // On the frontend the Elementor Widgets Manager can initialise at an | |
| 223 | - // unpredictable time — e.g. Elementor Pro's Theme Builder boots it on | |
| 224 | - // template_redirect — when WooCommerce query conditionals such as | |
| 225 | - // is_shop()/is_archive() are not yet reliable. Widget registration is | |
| 226 | - // cached for the whole request, so gating it by those conditionals can | |
| 227 | - // permanently skip ShopBuilder widgets, leaving the builder template to | |
| 228 | - // render empty container shells. Register unconditionally on the | |
| 229 | - // frontend; keep the per-category gate only for the editor widget panel. | |
| 230 | - if ( ! is_admin() ) { | |
| 231 | - return true; | |
| 232 | - } | |
| 233 | - | |
| 234 | - switch ( $category ) { | |
| 235 | - case 'product': | |
| 236 | - return BuilderFns::is_product() || $import; | |
| 237 | - case 'shop': | |
| 238 | - return BuilderFns::is_archive() || BuilderFns::is_shop() || $import; | |
| 239 | - case 'archive': | |
| 240 | - return BuilderFns::is_archive() || $import; | |
| 241 | - case 'cart': | |
| 242 | - return BuilderFns::is_cart() || $import; | |
| 243 | - case 'checkout': | |
| 244 | - return BuilderFns::is_checkout() || $import; | |
| 245 | - case 'general': | |
| 246 | - return true; | |
| 247 | - default: | |
| 248 | - return false; | |
| 249 | - } | |
| 250 | - } | |
| 251 | - | |
| 252 | - /** | |
| 253 | 239 | * Adding custom icons in Elementor |
| 254 | 240 | * |
| 255 | 241 | * @param array $tabs Tabs. |
| 256 | 242 | * |
| @@ -321,20 +307,12 @@ | ||
| 321 | 307 | |
| 322 | 308 | $parent_class = apply_filters( 'rtsb/builder/content/parent_class', [] ); |
| 323 | 309 | |
| 324 | 310 | if ( BuilderFns::is_product() ) { |
| 325 | - $product_id = Fns::get_prepared_product_id(); | |
| 326 | - | |
| 327 | - // Ensure the WordPress global $product is a valid WC_Product before | |
| 328 | - // wc_get_product_class() fires the `woocommerce_post_class` filter. | |
| 329 | - // Some themes (e.g. Blocksy) read the global $product directly inside | |
| 330 | - // that filter and call methods like get_type() on it, which throws a | |
| 331 | - // fatal error when the global is still an unresolved string. | |
| 332 | - $_product = Fns::get_product(); | |
| 333 | - | |
| 311 | + $product_id = Fns::get_prepared_product_id(); | |
| 334 | 312 | $parent_class = wc_get_product_class( $parent_class, $product_id ); |
| 335 | - | |
| 336 | - if ( function_exists( 'rtwpvs' ) && $_product instanceof \WC_Product ) { | |
| 313 | + if ( function_exists( 'rtwpvs' ) ) { | |
| 314 | + $_product = Fns::get_product(); | |
| 337 | 315 | if ( $_product->is_type( 'variable' ) ) { |
| 338 | 316 | $parent_class[] = 'rtwpvs-product'; |
| 339 | 317 | $beside_label = function_exists( 'rtwpvsp' ) && rtwpvs()->get_option( 'attribute_on_click_behavior' ); |
| 340 | 318 | if ( $beside_label ) { |
