Merge branch 'next'

Author: meld-cp

CHANGELOG.md

@@ -7,6 +7,13 @@ Thank you for your support 😊
 
 Report any bugs or feature requests [here](https://github.com/meld-cp/obsidian-encrypt/issues).
 
+## v2.4.1
+- Fix tab order, [#173](https://github.com/meld-cp/obsidian-encrypt/issues?q=is%3Aissue%20173)
+- Fix switching view modes may lose content (feat-whole-note), [#187](https://github.com/meld-cp/obsidian-encrypt/issues/187)
+- Fix decrypt not working for large text (feat-in-place), [#188](https://github.com/meld-cp/obsidian-encrypt/issues/188), added new settings to adjust scan range per user requirements.
+- Fix missing view actions (feat-whole-note), [#192](https://github.com/meld-cp/obsidian-encrypt/issues/192)
+
+
 ## v2.4.0
 - Rewrite the encrypted note editor to be based off the Obsidian note editor. Fixes [#142](https://github.com/meld-cp/obsidian-encrypt/issues/142), [#145](https://github.com/meld-cp/obsidian-encrypt/issues/145), [#148](https://github.com/meld-cp/obsidian-encrypt/issues/148), [#152](https://github.com/meld-cp/obsidian-encrypt/issues/152), [#153](https://github.com/meld-cp/obsidian-encrypt/issues/153), [#154](https://github.com/meld-cp/obsidian-encrypt/issues/154), [#159](https://github.com/meld-cp/obsidian-encrypt/issues/159)
 - Build a standalone CLI script (mdenc) to work with encrypted notes independently to Obsidian. See [#105](https://github.com/meld-cp/obsidian-encrypt/issues/105).

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "meld-encrypt",
 	"name": "Meld Encrypt",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"minAppVersion": "1.0.3",
 	"description": "Hide secrets in your vault",
 	"author": "meld-cp",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-sample-plugin",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"description": "Hide secrets in your vault",
 	"main": "main.js",
 	"scripts": {

src/PluginPasswordModal.ts

@@ -1,26 +1,26 @@
 import { App, Modal, Setting, TextComponent } from 'obsidian';
 import { UiHelper } from 'src/services/UiHelper';
-import { IPasswordAndHint } from './services/SessionPasswordService';
+import { PasswordAndHint } from './services/SessionPasswordService';
 
 export default class PluginPasswordModal extends Modal {
 
 	// input
 	private title: string;
-	private defaultPassword: IPasswordAndHint | null;
+	private defaultPassword: PasswordAndHint | null;
 	//private defaultHint?: string | null = null;
 	private confirmPassword: boolean;
 	private isEncrypting: boolean;
 
 	// output
 	public resultConfirmed = false;
-	public resultPassword: IPasswordAndHint;
+	public resultPassword: PasswordAndHint;
 
 	constructor(
 		app: App,
 		title: string,
 		isEncrypting:boolean,
 		confirmPassword: boolean,
-		defaultPassword: IPasswordAndHint | null,
+		defaultPassword: PasswordAndHint | null,
 	) {
 		super(app);
 		this.title = title;
@@ -46,6 +46,7 @@ export default class PluginPasswordModal extends Modal {
 
 		UiHelper.buildPasswordSetting({
 			container: contentEl,
+			tabIndex: 0,
 			name: 'Password:',
 			placeholder: this.isEncrypting ? '' : `Hint: ${hint}`,
 			initialValue: password,
@@ -85,6 +86,7 @@ export default class PluginPasswordModal extends Modal {
 		const sConfirmPassword = UiHelper.buildPasswordSetting({
 			container : contentEl,
 			name: 'Confirm Password:',
+			tabIndex: 1,
 			autoFocus: password != '',
 			onChangeCallback: (value) => {
 				confirmPass = value;
@@ -119,6 +121,7 @@ export default class PluginPasswordModal extends Modal {
 			.addText( tc=>{
 				//tcHint = tc;
 				tc.inputEl.placeholder = `Password Hint`;
+				tc.inputEl.tabIndex = 2;
 				tc.setValue(hint);
 				tc.onChange( v=> hint = v );
 				tc.inputEl.on('keypress', '*', (ev, target) => {
@@ -142,6 +145,7 @@ export default class PluginPasswordModal extends Modal {
 		/* END Hint text row */
 
 		new Setting(contentEl).addButton( cb=>{
+			cb.buttonEl.tabIndex = 99;
 			cb
 				.setButtonText('Confirm')
 				.onClick( evt =>{
@@ -173,8 +177,8 @@ export default class PluginPasswordModal extends Modal {
 
 	}
 
-	open2Async(): Promise<IPasswordAndHint|null> {
-		return new Promise<IPasswordAndHint|null>( (resolve, reject) =>{
+	open2Async(): Promise<PasswordAndHint|null> {
+		return new Promise<PasswordAndHint|null>( (resolve, reject) =>{
 
 			this.onClose = () =>{
 				if (this.resultConfirmed == true){
@@ -189,8 +193,8 @@ export default class PluginPasswordModal extends Modal {
 		} );
 	}
 
-	openAsync(): Promise<IPasswordAndHint> {
-		return new Promise<IPasswordAndHint>( (resolve, reject) =>{
+	openAsync(): Promise<PasswordAndHint> {
+		return new Promise<PasswordAndHint>( (resolve, reject) =>{
 
 			this.onClose = () =>{
 				if (this.resultConfirmed == true){

src/features/feature-convert-note/FeatureConvertNote.ts

@@ -3,7 +3,7 @@ import { IMeldEncryptPluginSettings } from "src/settings/MeldEncryptPluginSettin
 import { IMeldEncryptPluginFeature } from "../IMeldEncryptPluginFeature";
 import { Notice, TFile, TextFileView } from "obsidian";
 import PluginPasswordModal from "src/PluginPasswordModal";
-import { IPasswordAndHint, SessionPasswordService } from "src/services/SessionPasswordService";
+import { PasswordAndHint, SessionPasswordService } from "src/services/SessionPasswordService";
 import { FileDataHelper, JsonFileEncoding } from "src/services/FileDataHelper";
 import { Utils } from "src/services/Utils";
 import "src/services/Constants";
@@ -198,7 +198,7 @@ export default class FeatureConvertNote implements IMeldEncryptPluginFeature {
 		}
 	}
 
-	private async closeUpdateRememberPasswordThenReopen( file:TFile, newFileExtension: string, content: string, pw:IPasswordAndHint ) {
+	private async closeUpdateRememberPasswordThenReopen( file:TFile, newFileExtension: string, content: string, pw:PasswordAndHint ) {
 
 		let didDetach = false;
 
@@ -225,7 +225,7 @@ export default class FeatureConvertNote implements IMeldEncryptPluginFeature {
 		}
 	}
 
-	private async encryptFile(file: TFile, passwordAndHint:IPasswordAndHint ) : Promise<string> {
+	private async encryptFile(file: TFile, passwordAndHint:PasswordAndHint ) : Promise<string> {
 		const content = await this.plugin.app.vault.read( file );
 		const encryptedData = await FileDataHelper.encrypt( passwordAndHint.password, passwordAndHint.hint, content );
 		return JsonFileEncoding.encode( encryptedData );

src/features/feature-inplace-encrypt/FeatureInplaceEncrypt.ts

@@ -12,8 +12,6 @@ import { Decryptable } from "./Decryptable";
 import { FeatureInplaceTextAnalysis } from "./featureInplaceTextAnalysis";
 import { _HINT, _PREFIXES, _PREFIX_ENCODE_DEFAULT, _PREFIX_ENCODE_DEFAULT_VISIBLE, _SUFFIXES, _SUFFIX_NO_COMMENT, _SUFFIX_WITH_COMMENT } from "./FeatureInplaceConstants";
 
-const MAX_LOOKBACK = 2000;
-
 export default class FeatureInplaceEncrypt implements IMeldEncryptPluginFeature{
 	plugin:MeldEncrypt;
 	pluginSettings: IMeldEncryptPluginSettings;
@@ -246,6 +244,25 @@ export default class FeatureInplaceEncrypt implements IMeldEncryptPluginFeature{
 			})
 		;
 
+		new Setting(containerEl)
+			.setName('Search limit for markers')
+			.setDesc('How far to look for markers when encrypting/decrypting.')
+			.addText( text => {
+				text
+					.setValue(this.featureSettings.markerSearchLimit?.toString() ?? '10000' )
+					.onChange( async value => {
+						const num = parseInt(value);
+						if ( !isNaN(num) ){
+							this.featureSettings.markerSearchLimit = num;
+							await saveSettingCallback();
+						}
+					})
+				;
+				text.inputEl.type = 'number';
+				text.inputEl.min = '1000';
+				text.inputEl.max = '9999999';
+			})
+
 		new Setting(containerEl)
 			.setName('By default, show encrypted marker when reading')
 			.setDesc('When encrypting inline text, should the default be to have a visible marker in Reading view?')
@@ -286,8 +303,8 @@ export default class FeatureInplaceEncrypt implements IMeldEncryptPluginFeature{
 			if ( !editor.somethingSelected() ){
 				// nothing selected, first assume user wants to decrypt, expand to start and end markers...
 				// but if no markers found then prompt to encrypt text
-				const foundStartPos = this.getClosestPrefixCursorPos( editor, MAX_LOOKBACK );
-				const foundEndPos = this.getClosestSuffixCursorPos(editor, MAX_LOOKBACK );
+				const foundStartPos = this.getClosestPrefixCursorPos( editor );
+				const foundEndPos = this.getClosestSuffixCursorPos( editor );
 
 				if (
 					foundStartPos == null
@@ -391,8 +408,10 @@ export default class FeatureInplaceEncrypt implements IMeldEncryptPluginFeature{
 		return false;
 	}
 
-	private getClosestPrefixCursorPos(editor: Editor, maxLookback: number ): EditorPosition | null{
+	private getClosestPrefixCursorPos(editor: Editor ): EditorPosition | null{
 
+		const maxLookback = this.featureSettings.markerSearchLimit;
+
 		const maxLengthPrefix = _PREFIXES.reduce((prev,cur, i) => {
 			if (i== 0) return cur;
 			if ( cur.length > prev.length ) return cur;
@@ -420,7 +439,9 @@ export default class FeatureInplaceEncrypt implements IMeldEncryptPluginFeature{
 
 	}
 
-	private getClosestSuffixCursorPos(editor: Editor, maxLookForward: number): EditorPosition | null{
+	private getClosestSuffixCursorPos( editor: Editor ): EditorPosition | null{
+		const maxLookForward = this.featureSettings.markerSearchLimit;
+
 		const maxLengthPrefix = _PREFIXES.reduce((prev,cur, i) => {
 			if (i== 0) return cur;
 			if ( cur.length > prev.length ) return cur;

src/features/feature-inplace-encrypt/IFeatureInplaceEncryptSettings.ts

@@ -1,4 +1,5 @@
 export interface IFeatureInplaceEncryptSettings {
 	expandToWholeLines: boolean;
+	markerSearchLimit: number;
 	showMarkerWhenReadingDefault: boolean;
 }