fix(bgColor): 🐛 Fixed a background color

Fix TypeError: backgroundColor?.isLighter is not a function, using updateBackground function

Author: AlexTorresDev

src/menubar/index.ts

@@ -575,7 +575,6 @@ export class MenuBar extends Disposable {
 		const cleanMenuLabel = cleanMnemonic(label)
 
 		// Update the button label to reflect mnemonics
-
 		if (this.options.enableMnemonics) {
 			const cleanLabel = strings.escape(label)
 
@@ -593,9 +592,9 @@ export class MenuBar extends Disposable {
 			if (escMatch) {
 				titleElement.innerText = ''
 				titleElement.append(
-					strings.ltrim(replaceDoubleEscapes(cleanLabel.substr(0, escMatch.index)), ' '),
+					strings.ltrim(replaceDoubleEscapes(cleanLabel.substring(0, escMatch.index)), ' '),
 					$('mnemonic', { 'aria-hidden': 'true' }, escMatch[3]),
-					strings.rtrim(replaceDoubleEscapes(cleanLabel.substr(escMatch.index + escMatch[0].length)), ' ')
+					strings.rtrim(replaceDoubleEscapes(cleanLabel.substring(escMatch.index + escMatch[0].length)), ' ')
 				)
 			} else {
 				titleElement.innerText = replaceDoubleEscapes(cleanLabel).trim()

src/menubar/menubar-options.ts

@@ -21,13 +21,6 @@ export interface MenuBarOptions {
      * **The default is undefined**
      */
     itemBackgroundColor?: Color;
-    /**
-     * @deprecated Use `setupTitlebar` method instead.
-     * The menu to show in the title bar.
-     * You can use `Menu` or not add this option and the menu created in the main process will be taken.
-     * **The default menu is undefined**
-     */
-    menu?: Menu;
     /**
      * The background color of the menu.
      * **The default is automatic**

src/titlebar/index.ts

@@ -37,6 +37,7 @@ export class CustomTitlebar extends ThemeBar {
 	}
 
 	private currentOptions: TitleBarOptions = {
+		backgroundColor: Color.WHITE,
 		closeable: true,
 		enableMnemonics: true,
 		// hideWhenClickingClose: false,
@@ -396,25 +397,24 @@ export class CustomTitlebar extends ThemeBar {
 				: ACTIVE_FOREGROUND
 		}
 
-		this.titlebar.style.color = foregroundColor.toString()
+		this.titlebar.style.color = foregroundColor?.toString()
 
 		if (this.menuBar) {
 			let fgColor
-			const backgroundColor = this.currentOptions.menuBarBackgroundColor ?? this.currentOptions.backgroundColor?.darken(0.12)
+			const backgroundColor = this.currentOptions.menuBarBackgroundColor || this.currentOptions.backgroundColor!.darken(0.12)
 
 			const foregroundColor = backgroundColor?.isLighter()
 				? INACTIVE_FOREGROUND_DARK
 				: INACTIVE_FOREGROUND
 
-			const bgColor = !this.currentOptions.itemBackgroundColor || this.currentOptions.itemBackgroundColor.equals(backgroundColor!)
-				? DEFAULT_ITEM_SELECTOR
-				: this.currentOptions.itemBackgroundColor
+			const bgColor = this.currentOptions.itemBackgroundColor && !this.currentOptions.itemBackgroundColor.equals(backgroundColor)
+				? this.currentOptions.itemBackgroundColor
+				: DEFAULT_ITEM_SELECTOR
 
-
-			if (bgColor.equals(DEFAULT_ITEM_SELECTOR)) {
+			if (bgColor?.equals(DEFAULT_ITEM_SELECTOR)) {
 				fgColor = backgroundColor?.isLighter() ? ACTIVE_FOREGROUND_DARK : ACTIVE_FOREGROUND
 			} else {
-				fgColor = bgColor.isLighter() ? ACTIVE_FOREGROUND_DARK : ACTIVE_FOREGROUND
+				fgColor = bgColor?.isLighter() ? ACTIVE_FOREGROUND_DARK : ACTIVE_FOREGROUND
 			}
 
 			this.menuBar.setStyles({
@@ -549,6 +549,7 @@ export class CustomTitlebar extends ThemeBar {
 	 * @param backgroundColor The color for the background
 	 */
 	public updateBackground(backgroundColor: Color) {
+		if (typeof backgroundColor === 'string') backgroundColor = Color.fromHex(backgroundColor)
 		this.currentOptions.backgroundColor = backgroundColor
 		this.updateStyles()
 
@@ -560,6 +561,7 @@ export class CustomTitlebar extends ThemeBar {
 	 * @param itemBGColor The color for the item background
 	 */
 	public updateItemBGColor(itemBGColor: Color) {
+		if (typeof itemBGColor === 'string') itemBGColor = Color.fromHex(itemBGColor)
 		this.currentOptions.itemBackgroundColor = itemBGColor
 		this.updateStyles()