🚧 add modal

This commit is contained in:
yanyongyu 2021-12-31 02:06:20 +08:00
parent 21a958ffd9
commit ab2c73856d
8 changed files with 286 additions and 5 deletions

View File

@ -34,6 +34,7 @@
"react-dom": "^17.0.1", "react-dom": "^17.0.1",
"react-paginate": "^8.1.0", "react-paginate": "^8.1.0",
"react-use-pagination": "^2.0.1", "react-use-pagination": "^2.0.1",
"resize-observer-polyfill": "^1.5.1",
"url-loader": "^4.1.1" "url-loader": "^4.1.1"
}, },
"devDependencies": { "devDependencies": {

View File

@ -0,0 +1,39 @@
import clsx from "clsx";
import React from "react";
export default function Modal({
active,
setActive,
children,
}: {
active: boolean;
setActive: (active: boolean) => void;
children: React.ReactNode;
}): JSX.Element {
return (
<>
{/* overlay */}
<div
className={clsx(
"fixed top-0 bottom-0 left-0 right-0 flex items-center justify-center transition z-[200]",
{
hidden: !active,
"pointer-events-auto": active,
}
)}
onClick={() => setActive(false)}
>
<div className="absolute top-0 bottom-0 left-0 right-0 h-full w-full bg-gray-800 opacity-[.46]"></div>
</div>
{/* modal */}
<div
className={clsx(
"fixed top-0 left-0 flex items-center justify-center h-full w-full transition z-[201] pointer-events-none",
{ hidden: !active }
)}
>
{children}
</div>
</>
);
}

View File

@ -1,9 +1,10 @@
import React, { useCallback } from "react"; import React, { useCallback, useRef } from "react";
import ReactPaginate from "react-paginate"; import ReactPaginate from "react-paginate";
import { usePagination } from "react-use-pagination"; import { usePagination } from "react-use-pagination";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { useContentWidth } from "../../libs/width";
import styles from "./styles.module.css"; import styles from "./styles.module.css";
export default function Paginate({ export default function Paginate({
@ -11,6 +12,9 @@ export default function Paginate({
setPage, setPage,
currentPage, currentPage,
}: ReturnType<typeof usePagination>): JSX.Element { }: ReturnType<typeof usePagination>): JSX.Element {
const ref = useRef<HTMLElement>();
const maxWidth = useContentWidth(ref.current?.parentElement ?? undefined);
const onPageChange = useCallback( const onPageChange = useCallback(
(selectedItem: { selected: number }) => { (selectedItem: { selected: number }) => {
setPage(selectedItem.selected); setPage(selectedItem.selected);
@ -18,8 +22,9 @@ export default function Paginate({
[setPage] [setPage]
); );
// FIXME: responsive width
return ( return (
<nav role="navigation" aria-label="Pagination Navigation"> <nav role="navigation" aria-label="Pagination Navigation" ref={ref}>
<ReactPaginate <ReactPaginate
pageCount={totalPages} pageCount={totalPages}
forcePage={currentPage} forcePage={currentPage}

View File

@ -1,12 +1,14 @@
import React from "react"; import React, { useCallback, useState } from "react";
import { usePagination } from "react-use-pagination"; import { usePagination } from "react-use-pagination";
import plugins from "../../static/plugins.json"; import plugins from "../../static/plugins.json";
import { useFilteredObjs } from "../libs/store"; import { useFilteredObjs } from "../libs/store";
import Card from "./Card"; import Card from "./Card";
import Modal from "./Modal";
import Paginate from "./Paginate"; import Paginate from "./Paginate";
export default function Adapter(): JSX.Element { export default function Adapter(): JSX.Element {
const [modalOpen, setModalOpen] = useState<boolean>(false);
const { const {
filter, filter,
setFilter, setFilter,
@ -20,6 +22,28 @@ export default function Adapter(): JSX.Element {
const { startIndex, endIndex } = props; const { startIndex, endIndex } = props;
const currentPlugins = filteredPlugins.slice(startIndex, endIndex + 1); const currentPlugins = filteredPlugins.slice(startIndex, endIndex + 1);
const [form, setForm] = useState<{
name: string;
desc: string;
projectLink: string;
moduleName: string;
homepage: string;
}>({ name: "", desc: "", projectLink: "", moduleName: "", homepage: "" });
const onSubmit = () => {
console.log(form);
};
const onChange = (event) => {
const target = event.target;
const value = target.type === "checkbox" ? target.checked : target.value;
const name = target.name;
setForm({
...form,
[name]: value,
});
event.preventDefault();
};
return ( return (
<> <>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4 mt-4 px-4"> <div className="grid grid-cols-1 sm:grid-cols-2 gap-4 mt-4 px-4">
@ -29,7 +53,10 @@ export default function Adapter(): JSX.Element {
placeholder="搜索插件" placeholder="搜索插件"
onChange={(event) => setFilter(event.target.value)} onChange={(event) => setFilter(event.target.value)}
/> />
<button className="w-full rounded-lg bg-hero text-white"> <button
className="w-full rounded-lg bg-hero text-white"
onClick={() => setModalOpen(true)}
>
</button> </button>
</div> </div>
@ -44,6 +71,78 @@ export default function Adapter(): JSX.Element {
<div className="grid grid-cols-1 p-4"> <div className="grid grid-cols-1 p-4">
<Paginate {...props} /> <Paginate {...props} />
</div> </div>
<Modal active={modalOpen} setActive={setModalOpen}>
<div className="w-full max-w-[600px] max-h-[90%] overflow-y-auto rounded shadow-lg m-6 origin-center transition z-[inherit] pointer-events-auto thin-scrollbar">
<div className="bg-light-nonepress-100 dark:bg-dark-nonepress-100">
<div className="px-6 pt-4 pb-2 font-medium text-xl">
<span></span>
</div>
<div className="px-6 pb-5 w-full">
<form onSubmit={onSubmit}>
<div className="grid grid-cols-1 gap-4 p-4">
<label className="flex flex-wrap">
<span className="mr-2">:</span>
<input
type="text"
name="name"
maxLength={20}
className="px-2 flex-grow rounded bg-light-nonepress-200 dark:bg-dark-nonepress-200"
onChange={onChange}
/>
</label>
<label className="flex flex-wrap">
<span className="mr-2">:</span>
<input
type="text"
name="desc"
className="px-2 flex-grow rounded bg-light-nonepress-200 dark:bg-dark-nonepress-200"
onChange={onChange}
/>
</label>
<label className="flex flex-wrap">
<span className="mr-2">PyPI :</span>
<input
type="text"
name="projectLink"
className="px-2 flex-grow rounded bg-light-nonepress-200 dark:bg-dark-nonepress-200"
onChange={onChange}
/>
</label>
<label className="flex flex-wrap">
<span className="mr-2">import :</span>
<input
type="text"
name="moduleName"
className="px-2 flex-grow rounded bg-light-nonepress-200 dark:bg-dark-nonepress-200"
onChange={onChange}
/>
</label>
<label className="flex flex-wrap">
<span className="mr-2">/:</span>
<input
type="text"
name="homepage"
className="px-2 flex-grow rounded bg-light-nonepress-200 dark:bg-dark-nonepress-200"
onChange={onChange}
/>
</label>
</div>
</form>
</div>
<div className="px-4 py-2 flex justify-end">
<button className="px-2 h-9 min-w-[64px] rounded text-hero hover:bg-hero hover:bg-opacity-[.08]">
</button>
<button
className="ml-2 px-2 h-9 min-w-[64px] rounded text-hero hover:bg-hero hover:bg-opacity-[.08]"
onClick={onSubmit}
>
</button>
</div>
</div>
</div>
</Modal>
</> </>
); );
} }

View File

@ -0,0 +1,67 @@
import { useLayoutEffect, useRef } from "react";
import ResizeObserver from "resize-observer-polyfill";
export function useResizeNotifier(
element: HTMLElement | undefined,
callback: () => void
) {
const callBackRef = useRef(callback);
useLayoutEffect(() => {
callBackRef.current = callback;
}, [callback]);
useLayoutEffect(() => {
if (!element) return;
const resizeObserver = new ResizeObserver(
withResizeLoopDetection(() => {
callBackRef.current!();
})
);
resizeObserver.observe(element);
return () => {
resizeObserver.disconnect();
};
}, [element]);
}
function withResizeLoopDetection(callback: () => void) {
return (entries: ResizeObserverEntry[], resizeObserver: ResizeObserver) => {
const elements = entries.map((entry) => entry.target);
const rectsBefore = elements.map((element) =>
element.getBoundingClientRect()
);
callback();
const rectsAfter = elements.map((element) =>
element.getBoundingClientRect()
);
const changedElements = elements.filter(
(_, i) => !areRectSizesEqual(rectsBefore[i], rectsAfter[i])
);
changedElements.forEach((element) =>
unobserveUntilNextFrame(element, resizeObserver)
);
};
}
function unobserveUntilNextFrame(
element: Element,
resizeObserver: ResizeObserver
) {
resizeObserver.unobserve(element);
requestAnimationFrame(() => {
resizeObserver.observe(element);
});
}
function areRectSizesEqual(rect1: DOMRect, rect2: DOMRect) {
return rect1.width === rect2.width && rect1.height === rect2.height;
}

View File

@ -23,7 +23,8 @@ export function filterObjs(filter: string, objs: Obj[]): Obj[] {
o.project_link?.indexOf(filter) != -1 || o.project_link?.indexOf(filter) != -1 ||
o.name.indexOf(filter) != -1 || o.name.indexOf(filter) != -1 ||
o.desc.indexOf(filter) != -1 || o.desc.indexOf(filter) != -1 ||
o.author.indexOf(filter) != -1 o.author.indexOf(filter) != -1 ||
o.tags.filter((t) => t.label.indexOf(filter) != -1).length > 0
); );
}); });
} }

64
website/src/libs/width.ts Normal file
View File

@ -0,0 +1,64 @@
import { useLayoutEffect, useState } from "react";
import { useResizeNotifier } from "./resize";
export function getElementWidth(element: HTMLElement) {
const style = getComputedStyle(element);
return (
styleMetricToInt(style.marginLeft) +
getWidth(element) +
styleMetricToInt(style.marginRight)
);
}
export function getContentWidth(element: HTMLElement) {
const style = getComputedStyle(element);
return (
element.getBoundingClientRect().width -
styleMetricToInt(style.borderLeftWidth) -
styleMetricToInt(style.paddingLeft) -
styleMetricToInt(style.paddingRight) -
styleMetricToInt(style.borderRightWidth)
);
}
export function getNonContentWidth(element: HTMLElement) {
const style = getComputedStyle(element);
return (
styleMetricToInt(style.marginLeft) +
styleMetricToInt(style.borderLeftWidth) +
styleMetricToInt(style.paddingLeft) +
styleMetricToInt(style.paddingRight) +
styleMetricToInt(style.borderRightWidth) +
styleMetricToInt(style.marginRight)
);
}
export function getWidth(element: HTMLElement) {
return element.getBoundingClientRect().width;
}
function styleMetricToInt(styleAttribute: string | null) {
return styleAttribute ? parseInt(styleAttribute) : 0;
}
export function useContentWidth(element: HTMLElement | undefined) {
const [width, setWidth] = useState<number>();
function syncWidth() {
const newWidth = element ? getContentWidth(element) : undefined;
if (width !== newWidth) {
setWidth(newWidth);
}
}
useResizeNotifier(element, syncWidth);
useLayoutEffect(syncWidth);
return width;
}

View File

@ -6642,6 +6642,11 @@ requires-port@^1.0.0:
resolved "https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" resolved "https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.nlark.com/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
integrity sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=
resolve-from@^4.0.0: resolve-from@^4.0.0:
version "4.0.0" version "4.0.0"
resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"