From 2680ace9d6cc4e4b0efab6ba76da591438f46c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20G=C3=B3mez=20Bermejo?= <sernn2@gmail.com>
Date: Wed, 27 Jul 2022 16:52:12 +0200
Subject: [PATCH] last adjustments for 2.0.0

---
 docs/docs/changelog.md                     | 12 ++++++++++++
 manifest-beta.json                         |  2 +-
 manifest.json                              |  4 ++--
 package.json                               |  4 ++--
 src/components/Table.tsx                   | 14 +++++++++-----
 src/components/styles/RowTemplateStyles.ts | 11 ++++++++++-
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md
index e9037306..0288a740 100644
--- a/docs/docs/changelog.md
+++ b/docs/docs/changelog.md
@@ -1,3 +1,15 @@
+# 2.0.0
+### Shiny new things
+- New style for navBar & "new row" button [ISSUE#206](https://github.com/RafaelGB/obsidian-db-folder/issues/206). Now the name of your ddbb is displayed in the navBar. To change it, just edit it into the settings.
+### Improved
+- Strategy of the filtering modifications. See more in this discussion [DISCUSSION#225](https://github.com/RafaelGB/obsidian-db-folder/discussions/225)
+
+### Visual
+- row template selector dark mode support [ISSUE#177](https://github.com/RafaelGB/obsidian-db-folder/issues/177)
+- Improve the empty template width [ISSUE#175](https://github.com/RafaelGB/obsidian-db-folder/issues/175)
+- Empty calendar cells will not show placeholder message. Just when are selected. [ISSUE#159](https://github.com/RafaelGB/obsidian-db-folder/issues/159)
+### No longer broken
+- Controling the duplicated columns using the file template option to create them. [ISSUE#224](https://github.com/RafaelGB/obsidian-db-folder/issues/224)
 # 2.0.0-beta.4
 ### Improved
 - Resizing do not move the column. It has its own slider
diff --git a/manifest-beta.json b/manifest-beta.json
index a5160700..a07b852b 100644
--- a/manifest-beta.json
+++ b/manifest-beta.json
@@ -1,7 +1,7 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "2.0.0-beta.4",
+	"version": "2.0.0",
 	"minAppVersion": "0.15.4",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",
diff --git a/manifest.json b/manifest.json
index d1d2e1e4..0862f34f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,8 @@
 {
 	"id": "dbfolder",
 	"name": "DB Folder",
-	"version": "1.8.2",
-	"minAppVersion": "0.14.8",
+	"version": "2.0.0",
+	"minAppVersion": "0.15.4",
 	"description": "Folder with the capability to store and retrieve data from a folder like database",
 	"author": "RafaelGB",
 	"authorUrl": "https://github.com/RafaelGB/obsidian-bd-folder",
diff --git a/package.json b/package.json
index 093d72e8..cbcfef87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dbfolder",
-	"version": "1.8.2",
+	"version": "2.0.0",
 	"description": "This is a sample plugin for Obsidian (https://obsidian.md)",
 	"main": "main.js",
 	"scripts": {
@@ -63,7 +63,7 @@
 		"react-dom": "18.2.0",
 		"react-csv": "2.2.2",
 		"react-popper": "2.3.0",
-		"@tanstack/react-table": "8.3.6",
+		"@tanstack/react-table": "8.5.1",
 		"@tanstack/match-sorter-utils": "8.1.1",
 		"react-select": "5.4.0",
 		"react-color": "2.19.3",
diff --git a/src/components/Table.tsx b/src/components/Table.tsx
index 9703bc5a..c7809fb5 100644
--- a/src/components/Table.tsx
+++ b/src/components/Table.tsx
@@ -440,14 +440,18 @@ export function Table(tableData: TableDataType) {
           <Select
             styles={CustomTemplateSelectorStyles}
             options={rowTemplatesOptions}
-            value={{
-              label: rowTemplateState,
-              value: rowTemplateState,
-            }}
+            value={
+              rowTemplateState
+                ? {
+                    label: rowTemplateState,
+                    value: rowTemplateState,
+                  }
+                : null
+            }
             isClearable={true}
             isMulti={false}
             onChange={handleChangeRowTemplate}
-            placeholder={<div>Without template. Select one to use...</div>}
+            placeholder={"Without template. Select one to use..."}
             menuPortalTarget={document.body}
             menuShouldBlockScroll={true}
             isSearchable
diff --git a/src/components/styles/RowTemplateStyles.ts b/src/components/styles/RowTemplateStyles.ts
index 2cc1af7e..1ff668b0 100644
--- a/src/components/styles/RowTemplateStyles.ts
+++ b/src/components/styles/RowTemplateStyles.ts
@@ -1,17 +1,26 @@
 import { GroupBase, StylesConfig } from "react-select";
 
 const CustomTemplateSelectorStyles: StylesConfig<any, true, GroupBase<any>> = {
+    singleValue: (styles) => ({
+        ...styles,
+        color: 'var(--text-normal)',
+    }),
+
     option: (styles, { data, isDisabled, isFocused, isSelected }) => {
         return {
             ...styles,
+            color: 'var(--text-normal)',
+            backgroundColor: 'var(--background-primary)',
             fontSize: '12px',
             textAlign: 'left',
             width: 'auto',
         }
     },
-    placeholder: (styles) => {
+    control: (styles) => {
         return {
             ...styles,
+            color: 'var(--text-normal)',
+            backgroundColor: 'var(--background-primary)',
             fontSize: '12px',
             textAlign: 'left',
             minWidth: '17rem',