Merge pull request #890 from trey-wallis/dev

Dev

Author: decaf-dev

manifest.json

@@ -9,5 +9,5 @@
 	"fundingUrl": {
 		"Buymeacoffee": "https://www.buymeacoffee.com/treywallis"
 	},
-	"version": "8.15.4"
+	"version": "8.15.5"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-dataloom",
-	"version": "8.15.4",
+	"version": "8.15.5",
 	"description": "Weave together data from diverse sources into different views. Inspired by Excel Spreadsheets and Notion.so.",
 	"main": "main.js",
 	"scripts": {

src/obsidian/modal/welcome-modal/index.tsx

@@ -32,7 +32,7 @@ export default class WelcomeModal extends Modal {
 			cardContainerEl,
 			"Quick start",
 			"Learn the basics of creating a loom",
-			"https://dataloom.xyz/basics/quick-start",
+			"https://dataloom.xyz/quick-start",
 			"table"
 		);
 
@@ -48,7 +48,7 @@ export default class WelcomeModal extends Modal {
 			cardContainerEl,
 			"Embedded looms",
 			"Learn how to embed a loom into a markdown note",
-			"https://dataloom.xyz/basics/embed-loom",
+			"https://dataloom.xyz/basics/embed-looms",
 			"sticky-note"
 		);
 

src/react/loom-app/option-bar/filter-menu/filter-row/index.tsx

@@ -26,6 +26,7 @@ interface Props {
 	conditionOptions: FilterCondition[];
 	selectedCondition: FilterCondition;
 	inputNode?: React.ReactNode;
+	useSpacer?: boolean;
 	onToggle: (id: string) => void;
 	onColumnChange: (id: string, columnId: string) => void;
 	onConditionChange: (id: string, value: FilterCondition) => void;
@@ -38,6 +39,7 @@ export default function FilterRow({
 	index,
 	id,
 	columns,
+	useSpacer,
 	isEnabled,
 	selectedColumnId,
 	selectedOperator,
@@ -53,15 +55,17 @@ export default function FilterRow({
 	return (
 		<div className="dataloom-filter-row">
 			<Wrap>
-				{index !== 0 ? (
+				{index !== 0 && (
 					<FilterOperator
 						id={id}
 						value={selectedOperator}
 						onChange={onOperatorChange}
 					/>
-				) : (
+				)}
+				{useSpacer && (
 					<div className="dataloom-filter-row__spacer"></div>
 				)}
+
 				<FilterColumnSelect
 					id={id}
 					columns={columns}

src/react/loom-app/option-bar/filter-menu/index.tsx

@@ -3,7 +3,6 @@ import Padding from "src/react/shared/padding";
 import Stack from "src/react/shared/stack";
 import Icon from "src/react/shared/icon";
 import FilterRow from "./filter-row";
-import Text from "src/react/shared/text";
 import Button from "src/react/shared/button";
 
 import ColumnNotFoundError from "src/shared/error/column-not-found-error";
@@ -613,6 +612,7 @@ export default function FilterMenu({
 									index={i}
 									key={id}
 									id={id}
+									useSpacer={filters.length > 1 && i === 0}
 									columns={columns}
 									selectedColumnId={columnId}
 									selectedCondition={condition}
@@ -628,16 +628,11 @@ export default function FilterMenu({
 								/>
 							);
 						})}
-						<Stack isHorizontal>
-							<Button
-								icon={<Icon lucideId="plus" />}
-								ariaLabel="Add filter"
-								onClick={() => onAddClick()}
-							/>
-							{filters.length === 0 && (
-								<Text value="No filters to display" />
-							)}
-						</Stack>
+						<Button
+							icon={<Icon lucideId="plus" />}
+							ariaLabel="Add filter"
+							onClick={() => onAddClick()}
+						/>
 					</Stack>
 				</Padding>
 			</div>

src/react/loom-app/option-bar/index.tsx

@@ -110,12 +110,24 @@ export default function OptionBar({
 
 	function handleFilterMenuOpen() {
 		filterMenu.onOpen(LoomMenuLevel.ONE);
+		if (filters.length === 0) {
+			onFilterAddClick();
+		}
 	}
 
 	function handleMoreMenuOpen() {
 		moreMenu.onOpen(LoomMenuLevel.ONE);
 	}
 
+	function handleFilterDelete(id: string) {
+		onFilterDeleteClick(id);
+
+		//Close the menu when the last filter is deleted
+		if (filters.length === 1) {
+			filterMenu.onClose();
+		}
+	}
+
 	const activeFilters = filters.filter((filter) => filter.isEnabled);
 
 	const sortedColumns = columns.filter(
@@ -228,7 +240,7 @@ export default function OptionBar({
 				columns={columns}
 				filters={filters}
 				onUpdate={onFilterUpdate}
-				onDeleteClick={onFilterDeleteClick}
+				onDeleteClick={handleFilterDelete}
 				onAddClick={onFilterAddClick}
 			/>
 		</>

src/react/shared/base-menu/index.tsx

@@ -18,6 +18,7 @@ interface Props {
 	width?: number;
 	height?: number;
 	maxWidth?: number;
+	minWidth?: number;
 	maxHeight?: number;
 	children: React.ReactNode;
 }
@@ -31,6 +32,7 @@ const BaseMenu = React.forwardRef<HTMLDivElement, Props>(
 			position,
 			width = 0,
 			height = 0,
+			minWidth = 0,
 			maxHeight = 0,
 			maxWidth = 0,
 			children,
@@ -79,6 +81,7 @@ const BaseMenu = React.forwardRef<HTMLDivElement, Props>(
 					left: numToPx(position.left),
 					width: width !== 0 ? numToPx(width) : "max-content",
 					height: height !== 0 ? numToPx(height) : "max-content",
+					minWidth: minWidth !== 0 ? numToPx(minWidth) : undefined,
 					maxWidth: maxWidth !== 0 ? numToPx(maxWidth) : undefined,
 					maxHeight: maxHeight !== 0 ? numToPx(maxHeight) : undefined,
 					overflowY: maxHeight !== 0 ? "scroll" : undefined,

src/react/shared/menu/index.tsx

@@ -14,6 +14,7 @@ interface Props {
 	openDirection?: LoomMenuOpenDirection;
 	topOffset?: number;
 	leftOffset?: number;
+	minWidth?: number;
 	width?: number;
 	height?: number;
 	maxWidth?: number;
@@ -27,6 +28,7 @@ export default function Menu({
 	hideBorder = false,
 	openDirection,
 	position,
+	minWidth = 0,
 	width = 0,
 	height = 0,
 	leftOffset = 0,
@@ -53,6 +55,7 @@ export default function Menu({
 			position={position}
 			width={width}
 			height={height}
+			minWidth={minWidth}
 			maxHeight={maxHeight}
 			maxWidth={maxWidth}
 		>

versions.json

@@ -153,5 +153,6 @@
 	"8.15.1": "1.4.0",
 	"8.15.2": "1.4.0",
 	"8.15.3": "1.4.0",
-	"8.15.4": "1.4.0"
+	"8.15.4": "1.4.0",
+	"8.15.5": "1.4.0"
 }