chore: address PR feedbacks

Co-authored-by: Utsav Patel <[email protected]>
Co-authored-by: Sanketio <[email protected]>

Author: up1512001

inc/classes/class-assets.php

@@ -67,7 +67,7 @@ private static function build_localized_data(): void {
 	 */
 	public function add_admin_scripts( $hook_suffix ): void {
 
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 
 		if ( strpos( $hook_suffix, 'onedesign-settings' ) !== false ) {
 
@@ -105,7 +105,7 @@ public function add_admin_scripts( $hook_suffix ): void {
 			}
 		}
 
-		if ( strpos( $hook_suffix, 'plugins' ) !== false && empty( Utils::get_current_site_type() ) && 'plugins-network' !== $current_screen->id ) {
+		if ( strpos( $hook_suffix, 'plugins' ) !== false && empty( Utils::get_current_site_type() ) && ( $current_screen && 'plugins-network' !== $current_screen->id ) ) {
 
 			// remove all notices.
 			remove_all_actions( 'admin_notices' );
@@ -161,9 +161,9 @@ public function add_admin_scripts( $hook_suffix ): void {
 	 */
 	public function enqueue_scripts(): void {
 
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 
-		if ( Pattern::SLUG === $current_screen->id ) {
+		if ( $current_screen && Pattern::SLUG === $current_screen->id ) {
 
 			$this->register_script(
 				'onedesign-patterns-library-script',

inc/classes/class-cpt-restriction.php

@@ -56,7 +56,8 @@ public function setup_hooks(): void {
 	 * @return string Modified title.
 	 */
 	public function add_default_title_to_editor( string $title ): string {
-		if ( Pattern::SLUG === get_current_screen()->post_type ) {
+		$current_screen = Utils::get_current_screen();
+		if ( $current_screen && Pattern::SLUG === $current_screen->post_type ) {
 			return esc_html__( 'Pattern Library', 'onedesign' );
 		}
 		return $title;
@@ -131,7 +132,7 @@ public function unregister_cpt(): void {
 	 */
 	public function limit_pattern_library_posts(): void {
 		// Check if we're trying to create a new pattern library post.
-		$screen = get_current_screen();
+		$screen = Utils::get_current_screen();
 		if ( ! $screen || Pattern::SLUG !== $screen->post_type || 'add' !== $screen->action ) {
 			return;
 		}
@@ -166,7 +167,7 @@ public function limit_pattern_library_posts(): void {
 	 * @return void
 	 */
 	public function limit_template_posts(): void {
-		$screen = get_current_screen();
+		$screen = Utils::get_current_screen();
 		if ( ! $screen || Template::SLUG !== $screen->post_type || 'add' !== $screen->action ) {
 			return;
 		}

inc/classes/class-hooks.php

@@ -82,7 +82,7 @@ public function add_setup_page_link( $links ): array {
 	 * @return void
 	 */
 	public function add_site_selection_modal(): void {
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 		if ( ! $current_screen || 'plugins' !== $current_screen->base ) {
 			return;
 		}
@@ -108,7 +108,7 @@ public function add_site_selection_modal(): void {
 	 * @return string
 	 */
 	public function add_body_class_for_modal( $classes ): string {
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 		if ( ! $current_screen || 'plugins' !== $current_screen->base ) {
 			return $classes;
 		}
@@ -133,7 +133,7 @@ public function add_body_class_for_modal( $classes ): string {
 	 * @return string
 	 */
 	public function add_body_class_for_missing_sites( $classes ): string {
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 
 		if ( ! $current_screen ) {
 			return $classes;
@@ -328,7 +328,7 @@ public function remove_core_block_patterns(): void {
 	 * @return void
 	 */
 	public function print_pattern_library_button_in_editor_js_template(): void {
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 		if ( ! $current_screen || Pattern::SLUG !== $current_screen->post_type ) {
 			return;
 		}
@@ -350,7 +350,7 @@ public function print_pattern_library_button_in_editor_js_template(): void {
 	 * @return void
 	 */
 	public function add_templates_button_to_editor(): void {
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 		if ( ! $current_screen || Template::SLUG !== $current_screen->post_type ) {
 			return;
 		}

inc/classes/class-multisite.php

@@ -66,9 +66,9 @@ public function render_governing_site_modal(): void {
 			return;
 		}
 
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 
-		if ( 'plugins-network' !== $current_screen->id ) {
+		if ( $current_screen && 'plugins-network' !== $current_screen->id ) {
 			return;
 		}
 
@@ -95,9 +95,9 @@ public function add_admin_body_class( string $classes ): string {
 			return $classes;
 		}
 
-		$current_screen = get_current_screen();
+		$current_screen = Utils::get_current_screen();
 
-		if ( is_network_admin() && 'plugins-network' === $current_screen->id ) {
+		if ( is_network_admin() && $current_screen && 'plugins-network' === $current_screen->id ) {
 			$classes .= ' onedesign-multisite-selection-modal ';
 		}
 		return $classes;

inc/classes/class-utils.php

@@ -472,4 +472,22 @@ public static function replace_block_refs( array $items, array $id_map = array()
 
 		return $items;
 	}
+
+	/**
+	 * Get current screen object.
+	 *
+	 * @return WP_Screen|null Current screen object or null if not available.
+	 */
+	public static function get_current_screen(): ?\WP_Screen {
+		if ( ! function_exists( 'get_current_screen' ) ) {
+			return null;
+		}
+		$screen = get_current_screen();
+
+		if ( ! is_a( $screen, '\WP_Screen' ) ) {
+			return null;
+		}
+
+		return $screen;
+	}
 }