V2

.gitignore

@@ -7,4 +7,15 @@ node_modules/
 uploads
 wp-table-builder.zip
 
-vendor/php-stubs
+vendor/php-stubs
+
+# v2
+v2/*
+!v2/build
+!v2/dist
+!v2/inc
+!v2/vendor
+!v2/wp-table-builder.php
+!v2/assets
+v2/assets/icons
+

export.js

@@ -110,4 +110,4 @@ output.on("close", () => {
 
 archive.on("error", (err) => {
   console.error("Error creating archive:", err);
-});
+});

inc/admin/class-admin-menu.php

@@ -53,7 +53,9 @@ public function __construct()
 		add_filter('set-screen-option', function ($status, $option, $value) {
 			return ($option == 'tables_per_page') ? (int) $value : $status;
 		}, 10, 3);
+
 		add_action('admin_menu', array($this, 'register_menus'), 9);
+
 		add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
 		add_action('wp_ajax_create_table', array($this, 'create_table'));
 		add_action('wp_ajax_save_table', array($this, 'save_table'));
@@ -275,6 +277,11 @@ public function add_wp_admin_bar_new_table_create_page($wp_admin_bar)
 	public function register_menus()
 	{
 
+		if (!WPTB_LEGACY_BUILDER) {
+			\WPTableBuilder\WPTableBuilder::add_menu();
+			return;
+		}
+
 		global $builder_page, $tables_overview, $table_list, $builder_tool_page;
 		$menu_cap = Helpers::wptb_get_capability_manage_options();
 
@@ -373,6 +380,9 @@ public function remove_admin_notices()
 
 	public function enqueue_scripts($hook)
 	{
+		if (!WPTB_LEGACY_BUILDER) {
+			return;
+		}
 		/*
 		 * This function is provided for demonstration purposes only.
 		 *
@@ -416,6 +426,7 @@ public function enqueue_scripts($hook)
 			$admin_object = [
 				'ajaxurl' => admin_url('admin-ajax.php'),
 				'security_code' => wp_create_nonce('wptb-security-nonce'),
+				'general_nonce' => wp_create_nonce('wp_table_builder_settings'),
 				'strings' => $strings,
 				'store' => [
 					'tableId' => $table_id,

inc/admin/css/src/admin.scss

@@ -224,8 +224,13 @@ body > img {
     opacity: 0.4;
 }
 
+.wptb-switch {
+    height: 100%;
+}
+
 .wptb-embed-btn,
 .wptb-preview-btn,
+.wptb-switch-v2-btn,
 .wptb-save-btn {
     height: 100%;
     display: flex;
@@ -234,8 +239,15 @@ body > img {
     text-decoration: none;
 }
 
+.wptb-switch-v2-btn {
+    border: 0;
+    border-right: 1px solid var(--wptb-plugin-theme-sidebar-bg);
+    position: relative;
+}
+
 .wptb-embed,
 .wptb-preview,
+.wptb-switch-v2,
 .wptb-save {
     display: flex;
     justify-content: center;
@@ -7630,3 +7642,14 @@ label.wptb-control-row {
 #mce-modal-block {
     z-index: 0 !important;
 }
+
+
+.wptb-v2-switch-to-new-builder {
+    padding: 10px 20px;
+    background: white;
+    color: black;
+    border-radius: 5px;
+    border: none;
+    cursor: pointer;
+    font-weight: bold;
+}