Skip to content

Commit 5ef6f33

Browse files
committed
Squashed personal changes
commit 46b10d9 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Tue Jun 25 08:20:10 2024 +0200 Fix error swapping default swap style over hx-swap #z186 commit 764cf9a Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:33:20 2024 +0200 Restore dist bash call for Windows commit 7d41292 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:24:29 2024 +0200 Dist commit e6a9114 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:22:11 2024 +0200 Restore lint-fix npm command commit 739f6a1 Merge: 940ce1c e1143de Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:17:16 2024 +0200 Merge branch 'dev' into v2-merge commit 940ce1c Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:16:43 2024 +0200 readLayout/writeLayout JSDoc commit 899f25f Merge: 51ef0e2 6f83885 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Jun 23 08:12:11 2024 +0200 Merge branch 'upstream-master' into v2-merge commit e1143de Author: Alexander Petros <apetros15@gmail.com> Date: Thu Jun 20 13:18:47 2024 -0400 Generate .d.ts file in build script (bigskysoftware#2653) * Generate .d.ts file in build script Resolves: bigskysoftware#2629 * Streamline configuration options Delete the JSConfig so we don't have to un-specify options when checking vs generating (and also to remove a config file). Steamline the options by re-using the NPM commands. * Remove type generating from dev script commit 51ef0e2 Merge: 2b95d79 601d16c Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Thu May 23 08:19:24 2024 +0200 Merge branch 'dev' into v2-merge commit 2b95d79 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Thu May 23 08:17:51 2024 +0200 Add/remove request indicators in layout queues commit 7eb8ebf Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Wed May 22 08:33:44 2024 +0200 Revert "forceUseFormData htmx.ajax parameter #z176" This reverts commit 701c4a0. commit 701c4a0 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Tue May 21 08:22:04 2024 +0200 forceUseFormData htmx.ajax parameter #z176 commit 9355c29 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Tue May 21 07:50:56 2024 +0200 Dist commit 5d1211a Merge: 6012f74 12675fd Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Tue May 21 07:39:41 2024 +0200 Merge branch 'dev' into v2-merge commit 6012f74 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Mon Apr 29 08:58:23 2024 +0200 Dist commit 36a6181 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sun Apr 28 15:40:32 2024 +0200 Fix boolean checkboxes values in form commit 9d65265 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sat Apr 27 10:19:41 2024 +0200 Update README.md commit 66300a1 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Sat Apr 27 10:07:30 2024 +0200 Restored my changes #z143 commit 9e4cd2b Merge: b176784 dc93911 Author: Vincent <vichenzo-thebaud@hotmail.com> Date: Fri Apr 26 09:00:41 2024 +0200 Merge branch 'dev' into v2-merge Support multiple extended selectors for hx-include #z167 Fix boolean checkboxes check
1 parent aa3dbf0 commit 5ef6f33

32 files changed

+3382
-2975
lines changed

dist/htmx.amd.js

Lines changed: 416 additions & 430 deletions
Large diffs are not rendered by default.

dist/htmx.cjs.js

Lines changed: 416 additions & 430 deletions
Large diffs are not rendered by default.

dist/htmx.esm.d.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
export default htmx;
22
export type HttpVerb = "get" | "head" | "post" | "put" | "delete" | "connect" | "options" | "trace" | "patch";
33
export type SwapOptions = {
4-
select?: string;
54
selectOOB?: string;
65
eventInfo?: any;
76
anchor?: string;
@@ -10,9 +9,10 @@ export type SwapOptions = {
109
afterSettleCallback?: swapCallback;
1110
};
1211
export type swapCallback = () => any;
13-
export type HtmxSwapStyle = "innerHTML" | "outerHTML" | "beforebegin" | "afterbegin" | "beforeend" | "afterend" | "delete" | "none" | string;
12+
export type HtmxSwapStyle = "innerHTML" | "outerHTML" | "beforebegin" | "afterbegin" | "beforeend" | "afterend" | "delete" | "none" | "mirror" | string;
1413
export type HtmxSwapSpecification = {
1514
swapStyle: HtmxSwapStyle;
15+
defaultSwapStyle?: HtmxSwapStyle;
1616
swapDelay: number;
1717
settleDelay: number;
1818
transition?: boolean;
@@ -54,12 +54,12 @@ export type HtmxAjaxHelperContext = {
5454
handler?: HtmxAjaxHandler;
5555
target?: Element | string;
5656
swap?: HtmxSwapStyle;
57+
errorTarget?: Element | string;
58+
errorSwap?: HtmxSwapStyle;
5759
values?: any | FormData;
5860
headers?: Record<string, string>;
59-
select?: string;
6061
};
6162
export type HtmxRequestConfig = {
62-
boosted: boolean;
6363
useUrlParams: boolean;
6464
formData: FormData;
6565
/**
@@ -85,8 +85,6 @@ export type HtmxResponseInfo = {
8585
target: Element;
8686
requestConfig: HtmxRequestConfig;
8787
etc: HtmxAjaxEtc;
88-
boosted: boolean;
89-
select: string;
9088
pathInfo: {
9189
requestPath: string;
9290
finalRequestPath: string;
@@ -96,13 +94,15 @@ export type HtmxResponseInfo = {
9694
failed?: boolean;
9795
successful?: boolean;
9896
keepIndicators?: boolean;
97+
defaultHandler: (elt: Element, responseInfo: HtmxResponseInfo) => void;
9998
};
10099
export type HtmxAjaxEtc = {
101100
returnPromise?: boolean;
102101
handler?: HtmxAjaxHandler;
103-
select?: string;
104102
targetOverride?: Element;
105103
swapOverride?: HtmxSwapStyle;
104+
errorTargetOverride?: Element;
105+
errorSwapOverride?: HtmxSwapStyle;
106106
headers?: Record<string, string>;
107107
values?: any | FormData;
108108
credentials?: boolean;
@@ -123,7 +123,6 @@ export type HtmxBeforeSwapDetails = HtmxResponseInfo & {
123123
serverResponse: any;
124124
isError: boolean;
125125
ignoreTitle: boolean;
126-
selectOverride: string;
127126
swapOverride: string;
128127
};
129128
export type HtmxAjaxHandler = (elt: Element, responseInfo: HtmxResponseInfo) => any;
@@ -181,7 +180,6 @@ declare namespace htmx {
181180
let allowScriptTags: boolean;
182181
let inlineScriptNonce: string;
183182
let inlineStyleNonce: string;
184-
let attributesToSettle: string[];
185183
let withCredentials: boolean;
186184
let timeout: number;
187185
let wsReconnectDelay: "full-jitter" | ((retryCount: number) => number);
@@ -194,13 +192,21 @@ declare namespace htmx {
194192
let methodsThatUseUrlParams: (HttpVerb)[];
195193
let selfRequestsOnly: boolean;
196194
let ignoreTitle: boolean;
197-
let scrollIntoViewOnBoost: boolean;
198195
let triggerSpecsCache: any | null;
199196
let disableInheritance: boolean;
200-
let responseHandling: HtmxResponseHandlingConfig[];
201197
let allowNestedOobSwaps: boolean;
198+
let defaultErrorSwapStyle: HtmxSwapStyle;
199+
let defaultErrorTarget: string;
200+
let httpErrorCodesToSwap: number[];
201+
let layoutQueuesEnabled: boolean;
202+
let cleanUpThrottlingEnabled: boolean;
203+
let disabledEvents: any;
202204
}
203205
let parseInterval: (str: string) => number | undefined;
204206
let _: (str: string) => any;
207+
let readLayout: (callback: () => void) => void;
208+
let writeLayout: (callback: () => void) => void;
209+
let querySelectorAllExt: (elt: Node | Element | Document | string, selector: string, global?: boolean | undefined) => (Node | Window)[];
210+
let querySelectorExt: (eltOrSelector: Node | string, selector?: string | undefined) => Node | Window;
205211
let version: string;
206212
}

0 commit comments

Comments
 (0)