← All changes
|
modules/global-classes/atomic-global-styles.php
+10
-11
4.1.0
→
4.1.0-beta1
View file →
| @@ -90,11 +90,9 @@ | ||
| 90 | 90 | if ( ! $item ) { |
| 91 | 91 | continue; |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - $resolved_label = $global_order[ $class_id ] ?? $item['label']; | |
| 95 | - $item['id'] = $resolved_label; | |
| 96 | - $item['label'] = $resolved_label; | |
| 94 | + $item['id'] = $item['label']; | |
| 97 | 95 | $styles[] = $item; |
| 98 | 96 | } |
| 99 | 97 | |
| 100 | 98 | return $styles; |
| @@ -161,13 +159,18 @@ | ||
| 161 | 159 | do_action( 'elementor/atomic-widgets/styles/clear', [ self::STYLES_KEY, $context ] ); |
| 162 | 160 | } |
| 163 | 161 | |
| 164 | 162 | private function transform_classes_names( $ids ) { |
| 163 | + $context = $this->get_context(); | |
| 165 | 164 | |
| 166 | - $labels = Global_Classes_Repository::make() | |
| 167 | - ->set_preview( $this->is_preview() ) | |
| 168 | - ->all_labels(); | |
| 165 | + $repository = Global_Classes_Repository::make(); | |
| 169 | 166 | |
| 167 | + if ( Global_Classes_Repository::CONTEXT_PREVIEW === $context ) { | |
| 168 | + $repository->set_preview( true ); | |
| 169 | + } | |
| 170 | + | |
| 171 | + $labels = $repository->all_labels(); | |
| 172 | + | |
| 170 | 173 | return array_map( |
| 171 | 174 | static function( $id ) use ( $labels ) { |
| 172 | 175 | return $labels[ $id ] ?? $id; |
| 173 | 176 | }, |
| @@ -175,13 +178,9 @@ | ||
| 175 | 178 | ); |
| 176 | 179 | } |
| 177 | 180 | |
| 178 | 181 | private function get_context(): string { |
| 179 | - return $this->is_preview() | |
| 182 | + return Plugin::$instance->preview->is_editor_or_preview() | |
| 180 | 183 | ? Global_Classes_Repository::CONTEXT_PREVIEW |
| 181 | 184 | : Global_Classes_Repository::CONTEXT_FRONTEND; |
| 182 | - } | |
| 183 | - | |
| 184 | - private function is_preview(): bool { | |
| 185 | - return Plugin::$instance->preview->is_editor_or_preview(); | |
| 186 | 185 | } |
| 187 | 186 | } |