diff options
| -rw-r--r-- | .DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | BackEnd/.DS_Store | bin | 6148 -> 0 bytes | |||
| -rw-r--r-- | BackEnd/Timeline.Tests/packages.lock.json | 12 | ||||
| -rw-r--r-- | BackEnd/Timeline/Timeline.csproj | 2 | ||||
| -rw-r--r-- | BackEnd/Timeline/packages.lock.json | 6 | ||||
| -rw-r--r-- | FrontEnd/src/utilities/useReverseScrollPositionRemember.ts | 77 | ||||
| -rw-r--r-- | FrontEnd/src/utilities/useScrollToTop.ts | 2 |
8 files changed, 13 insertions, 88 deletions
diff --git a/.DS_Store b/.DS_Store Binary files differdeleted file mode 100644 index e970fa9e..00000000 --- a/.DS_Store +++ /dev/null @@ -229,3 +229,5 @@ _Pvt_Extensions # FAKE - F# Make .fake/ + +.DS_Store diff --git a/BackEnd/.DS_Store b/BackEnd/.DS_Store Binary files differdeleted file mode 100644 index fd43f3f2..00000000 --- a/BackEnd/.DS_Store +++ /dev/null diff --git a/BackEnd/Timeline.Tests/packages.lock.json b/BackEnd/Timeline.Tests/packages.lock.json index f1679705..32cba1af 100644 --- a/BackEnd/Timeline.Tests/packages.lock.json +++ b/BackEnd/Timeline.Tests/packages.lock.json @@ -130,8 +130,8 @@ }, "Markdig": { "type": "Transitive", - "resolved": "0.28.1", - "contentHash": "70CneXw2N/1t7v6OfZJqMKLPRB1YWTPddEIcHT/P6IL6X1zsXELIu/DHVt96kr83PIVLznMuXoFK6b9N9KTODg==" + "resolved": "0.30.2", + "contentHash": "rm5rfHGP0BZtcB31CmQeWLLPdpG6xA6xN92x2KcNrl+9MPJONq9u4dfG7VgnTOxdjDnuEkX6GCxMYS+LpoKGOQ==" }, "Microsoft.AspNetCore.Connections.Abstractions": { "type": "Transitive", @@ -749,8 +749,8 @@ }, "SixLabors.ImageSharp": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "H8npUDq3VRagzRsJVxaNoUSMmD+kjAs7sR1Ip85eWbN5c0O1medMw/FiQ32dSNfWz/gVrc+xHs3es9SFlAiNBw==", + "resolved": "2.1.1", + "contentHash": "oNHMT8+yUR9dyuU2r7fwsXvvS4OnfCs9N5i2y2p9iBxp3nvEZbe/hZWrOGfD7MX2lxOAlWzlhzj0q2uFwP8avg==", "dependencies": { "System.Runtime.CompilerServices.Unsafe": "5.0.0", "System.Text.Encoding.CodePages": "5.0.0" @@ -1755,13 +1755,13 @@ "dependencies": { "AutoMapper": "11.0.1", "AutoMapper.Extensions.Microsoft.DependencyInjection": "11.0.0", - "Markdig": "0.28.1", + "Markdig": "0.30.2", "Microsoft.AspNetCore.SpaServices.Extensions": "6.0.4", "Microsoft.EntityFrameworkCore": "6.0.4", "Microsoft.EntityFrameworkCore.Analyzers": "6.0.4", "Microsoft.EntityFrameworkCore.Sqlite": "6.0.4", "NSwag.AspNetCore": "13.15.10", - "SixLabors.ImageSharp": "2.1.0", + "SixLabors.ImageSharp": "2.1.1", "System.IdentityModel.Tokens.Jwt": "6.17.0" } } diff --git a/BackEnd/Timeline/Timeline.csproj b/BackEnd/Timeline/Timeline.csproj index 6ab2f9d4..33ad5950 100644 --- a/BackEnd/Timeline/Timeline.csproj +++ b/BackEnd/Timeline/Timeline.csproj @@ -36,7 +36,7 @@ <ItemGroup>
<PackageReference Include="AutoMapper" Version="11.0.1" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="11.0.0" />
- <PackageReference Include="Markdig" Version="0.30.0" />
+ <PackageReference Include="Markdig" Version="0.30.2" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="6.0.4" />
diff --git a/BackEnd/Timeline/packages.lock.json b/BackEnd/Timeline/packages.lock.json index 948b30cc..683332f9 100644 --- a/BackEnd/Timeline/packages.lock.json +++ b/BackEnd/Timeline/packages.lock.json @@ -23,9 +23,9 @@ }, "Markdig": { "type": "Direct", - "requested": "[0.30.0, )", - "resolved": "0.30.0", - "contentHash": "wpuC7a5W/c9bsAzQs8Pxuo2S1KlLDIL3stOHpWW7UwGneYbdh3fByPCAyGmsu5FzPsJsqpbjVSYU5RLKkwk2lA==" + "requested": "[0.30.2, )", + "resolved": "0.30.2", + "contentHash": "rm5rfHGP0BZtcB31CmQeWLLPdpG6xA6xN92x2KcNrl+9MPJONq9u4dfG7VgnTOxdjDnuEkX6GCxMYS+LpoKGOQ==" }, "Microsoft.AspNetCore.SpaServices.Extensions": { "type": "Direct", diff --git a/FrontEnd/src/utilities/useReverseScrollPositionRemember.ts b/FrontEnd/src/utilities/useReverseScrollPositionRemember.ts deleted file mode 100644 index a5812808..00000000 --- a/FrontEnd/src/utilities/useReverseScrollPositionRemember.ts +++ /dev/null @@ -1,77 +0,0 @@ -import React from "react"; - -let on = false; - -let reverseScrollPosition = getReverseScrollPosition(); -let reverseScrollToPosition: number | null = null; -let lastScrollPosition = window.scrollY; - -export function getReverseScrollPosition(): number { - if (document.documentElement.scrollHeight <= window.innerHeight) { - return 0; - } else { - return ( - document.documentElement.scrollHeight - - document.documentElement.scrollTop - - window.innerHeight - ); - } -} - -export function scrollToReverseScrollPosition(reversePosition: number): void { - if (document.documentElement.scrollHeight <= window.innerHeight) return; - - const old = document.documentElement.style.scrollBehavior; - document.documentElement.style.scrollBehavior = "auto"; - - const newPosition = - document.documentElement.scrollHeight - - window.innerHeight - - reversePosition; - - reverseScrollToPosition = newPosition; - - window.scrollTo(0, newPosition); - - document.documentElement.style.scrollBehavior = old; -} - -const scrollListener = (): void => { - if ( - reverseScrollToPosition != null && - Math.abs(window.scrollY - reverseScrollToPosition) > 50 - ) { - scrollToReverseScrollPosition(reverseScrollPosition); - return; - } - if ( - reverseScrollToPosition == null && - Math.abs(window.scrollY - lastScrollPosition) > 1000 - ) { - scrollToReverseScrollPosition(reverseScrollPosition); - return; - } - - reverseScrollToPosition = null; - lastScrollPosition = window.scrollY; - reverseScrollPosition = getReverseScrollPosition(); -}; - -const resizeObserver = new ResizeObserver(() => { - scrollToReverseScrollPosition(reverseScrollPosition); -}); - -export default function useReverseScrollPositionRemember(): void { - React.useEffect(() => { - if (on) return; - on = true; - window.addEventListener("scroll", scrollListener); - resizeObserver.observe(document.documentElement); - - return () => { - window.removeEventListener("scroll", scrollListener); - resizeObserver.disconnect(); - on = false; - }; - }, []); -} diff --git a/FrontEnd/src/utilities/useScrollToTop.ts b/FrontEnd/src/utilities/useScrollToTop.ts index 892e3545..95c8b7b9 100644 --- a/FrontEnd/src/utilities/useScrollToTop.ts +++ b/FrontEnd/src/utilities/useScrollToTop.ts @@ -6,7 +6,7 @@ function useScrollToTop( handler: () => void, enable = true, option = { - maxOffset: 50, + maxOffset: 5, throttle: 1000, } ): void { |