Merge branch 'master' into release

mProjectsCode · mProjectsCode · commit 0fc63311c31a · 2022-10-11T12:08:47.000+02:00
diff --git a/README.md b/README.md
@@ -28,6 +28,7 @@ For more examples see the `exampleVault` folder.
 - `select` a select input field, only for code blocks
 - `multi_select` a multi-select input field, only for code blocks
 - `date` a date input field
+- `date_picker` a date picker
 
 #### Arguments
 - `class(class_name)` adds a css class to the input field
@@ -36,9 +37,10 @@ For more examples see the `exampleVault` folder.
 - `maxValue(value)` only for slider, sets the max value
 - `option(value)` only for (multi-)selects, adds an option to the select
 - `title(value)` only for (multi-)selects, adds a title to the select input
+- `alignRight` only for date picker, aligns the date picker popup to the right of the input field
 
 ### How to install
-You must manually download the zip archive from the latest release here on GitHub.  
+You can eiter download it directly through Obsidian's plugin page or you can manually download the zip archive from the latest release here on GitHub.  
 After downloading, extract the archive into the `.obsidian/plugins` folder in your vault.
 
 The folder structure should look like this:
diff --git a/exampleVault/.obsidian/plugins/obsidian-meta-bind-plugin/main.js b/exampleVault/.obsidian/plugins/obsidian-meta-bind-plugin/main.js
diff --git a/exampleVault/.obsidian/plugins/obsidian-meta-bind-plugin/manifest.json b/exampleVault/.obsidian/plugins/obsidian-meta-bind-plugin/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-meta-bind-plugin",
 	"name": "Meta Bind Plugin",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"minAppVersion": "0.14.0",
 	"description": "This plugin can create input fields inside your notes and bind them to metadata fields.",
 	"author": "Moritz Jung",
diff --git a/exampleVault/examples.md b/exampleVault/examples.md
@@ -121,7 +121,7 @@ option(option d)
 ):other note#multi-select]
 ```
 
-Lorem ipsum dolor sit amet, `INPUT[date():other note#date]` consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. `INPUT[date():other note#date]` Curabitur sed rhoncus nisl. Maecenas nisi justo, viverra vel tempus vel, hendrerit at metus. `INPUT[date_picker:other note#date]`  asdasd asdasdasd
+Lorem ipsum dolor sit amet, `INPUT[date():other note#date]` consectetur adipiscing elit. Pellentesque sit amet porttitor arcu. Quisque scelerisque dolor augue, et posuere nulla bibendum nec. `INPUT[date():other note#date]` Curabitur sed rhoncus nisl. Maecenas nisi justo, viverra vel tempus vel, hendrerit at metus. `INPUT[date_picker():other note#date]`  asdasd asdasdasd
 
 asdasd
 
diff --git a/exampleVault/other note.md b/exampleVault/other note.md
@@ -1,9 +1,9 @@
 ---
-title: asdasds sdf sasdfnosdijn  sdaskdjasbokbfosdasdasdasd asd asdasda f
-select: option b
+title: asdasds sdf sasdfnosdijn  sdaskdjasbokbfosdasdasdasd asd asd
+select: option a
 multi-select:
-  - option b
+  - option a
   - option c
-date: Monday, June 4th 2029
+date: Wednesday, June 6th 2029
 time: 19:20
 ---
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-meta-bind-plugin",
 	"name": "Meta Bind Plugin",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"minAppVersion": "0.14.0",
 	"description": "This plugin can create input fields inside your notes and bind them to metadata fields.",
 	"author": "Moritz Jung",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-meta-bind-plugin",
-	"version": "0.2.1",
+	"version": "0.3.0",
 	"description": "This plugin can create input fields inside your notes and bind them to metadata fields.",
 	"main": "main.js",
 	"scripts": {
diff --git a/src/inputFieldArguments/AlignRightInputFieldArgument.ts b/src/inputFieldArguments/AlignRightInputFieldArgument.ts
@@ -0,0 +1,16 @@
+import {AbstractInputFieldArgument} from './AbstractInputFieldArgument';
+import {InputFieldArgumentType, InputFieldType} from '../parsers/InputFieldDeclarationParser';
+
+export class AlignRightInputFieldArgument extends AbstractInputFieldArgument {
+	identifier: InputFieldArgumentType = InputFieldArgumentType.ALIGN_RIGHT;
+	allowedInputFields: InputFieldType[] = [
+		InputFieldType.DATE_PICKER,
+	];
+	value: boolean = true;
+	requiresValue: boolean = false;
+	allowMultiple: boolean = false;
+
+	parseValue(valueStr: string): void {
+		this.value = (valueStr.toLowerCase() === 'true');
+	}
+}
diff --git a/src/inputFieldArguments/InputFieldArgumentFactory.ts b/src/inputFieldArguments/InputFieldArgumentFactory.ts
@@ -6,6 +6,7 @@ import {MinValueInputFieldArgument} from "./MinValueInputFieldArgument";
 import {MaxValueInputFieldArgument} from "./MaxValueInputFieldArgument";
 import {OptionInputFieldArgument} from "./OptionInputFieldArgument";
 import {TitleInputFieldArgument} from "./TitleInputFieldArgument";
+import {AlignRightInputFieldArgument} from './AlignRightInputFieldArgument';
 
 
 export class InputFieldArgumentFactory {
@@ -22,6 +23,8 @@ export class InputFieldArgumentFactory {
 			return new OptionInputFieldArgument();
 		} else if (argumentIdentifier === InputFieldArgumentType.TITLE) {
 			return new TitleInputFieldArgument();
+		} else if (argumentIdentifier === InputFieldArgumentType.ALIGN_RIGHT) {
+			return new AlignRightInputFieldArgument();
 		} else {
 			throw new MetaBindParsingError(`unknown argument \'${argumentIdentifier}\'`);
 		}
diff --git a/src/inputFields/DatePicker/DatePicker.svelte b/src/inputFields/DatePicker/DatePicker.svelte
@@ -12,6 +12,8 @@
 	export let dateFormat: string = 'dddd, MMMM Do YYYY';
 	export let dateChangeCallback: (date: Moment) => void;
 
+	export let alignRight: boolean;
+
 	let date: number;
 	let month: number;
 	let year: number;
@@ -68,7 +70,6 @@
 	.date-picker {
 		position:      absolute;
 		top:           35px;
-		left:          0;
 		display:       inline-block;
 		background:    var(--background-secondary);
 		border-radius: var(--meta-bind-plugin-border-radius);
@@ -134,7 +135,7 @@
 	</div>
 	{#if showDatePicker}
 		<div class="date-picker-close-layer" on:click={() => showDatePicker = false}></div>
-		<div class="date-picker">
+		<div class="date-picker" style="{alignRight ? 'left: auto; right: 0;' : 'right: auto; left: 0;'}">
 			<div class="date-picker-header">
 				<button class="month-switch-button" on:click={prevMonth}>Prev</button>
 				<div class="date-picker-header-text">
diff --git a/src/inputFields/DatePicker/DatePickerInputField.ts b/src/inputFields/DatePicker/DatePickerInputField.ts
@@ -1,9 +1,10 @@
 import {InputFieldMarkdownRenderChild} from '../../InputFieldMarkdownRenderChild';
 import {AbstractInputField} from '../AbstractInputField';
-import {MetaBindInternalError} from '../../utils/Utils';
+import {isTruthy, MetaBindInternalError} from '../../utils/Utils';
 import DatePicker from './DatePicker.svelte';
 import {moment} from 'obsidian';
 import {DateParser} from '../../parsers/DateParser';
+import {InputFieldArgumentType} from '../../parsers/InputFieldDeclarationParser';
 
 export class DatePickerInputField extends AbstractInputField {
 	container: HTMLDivElement | undefined;
@@ -68,6 +69,7 @@ export class DatePickerInputField extends AbstractInputField {
 		this.component = new DatePicker({
 			target: container,
 			props: {
+				alignRight: this.inputFieldMarkdownRenderChild.getArgument(InputFieldArgumentType.ALIGN_RIGHT)?.value,
 				selectedDate: this.date,
 				dateFormat: this.inputFieldMarkdownRenderChild.plugin.settings.preferredDateFormat,
 				dateChangeCallback: (date: moment.Moment) => this.datePickerValueChanged(date),
diff --git a/src/main.ts b/src/main.ts
@@ -38,7 +38,8 @@ export default class MetaBindPlugin extends Plugin {
 					context.addChild(new InputFieldMarkdownRenderChild(
 						codeBlock,
 						InputFieldMarkdownRenderChildType.INLINE_CODE_BLOCK,
-						text, this,
+						text,
+						this,
 						context.sourcePath,
 						this.markDownInputFieldIndex,
 					));
diff --git a/src/parsers/InputFieldDeclarationParser.ts b/src/parsers/InputFieldDeclarationParser.ts
@@ -24,6 +24,7 @@ export enum InputFieldArgumentType {
 	MAX_VALUE = 'maxValue',
 	OPTION = 'option',
 	TITLE = 'title',
+	ALIGN_RIGHT = 'alignRight',
 
 	INVALID = 'invalid',
 }
@@ -106,9 +107,9 @@ export class InputFieldDeclarationParser {
 
 
 		if (useTemplate) {
-			console.log(templateName);
+			// console.log(templateName);
 			const template = InputFieldDeclarationParser.templates.filter(x => x.identifier === templateName).first()?.template;
-			console.log(template);
+			// console.log(template);
 			if (template) {
 				inputFieldDeclaration.bindTarget = inputFieldDeclaration.bindTarget || template.bindTarget;
 				inputFieldDeclaration.isBound = inputFieldDeclaration.isBound || template.isBound;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "obsidian-meta-bind-plugin",`
`3`	`3`	`"name": "Meta Bind Plugin",`
`4`		`- "version": "0.2.1",`
	`4`	`+ "version": "0.3.0",`
`5`	`5`	`"minAppVersion": "0.14.0",`
`6`	`6`	`"description": "This plugin can create input fields inside your notes and bind them to metadata fields.",`
`7`	`7`	`"author": "Moritz Jung",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "obsidian-meta-bind-plugin",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.3.0",`
`4`	`4`	`"description": "This plugin can create input fields inside your notes and bind them to metadata fields.",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"scripts": {`