Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix emoji #43

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Fix emoji #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
390e48b
Add new input fields and fix emoji picker bug in
walnuts1018 Nov 6, 2023
9f5735b
Add .hintrc file and update Balance component in
walnuts1018 Nov 6, 2023
35adf79
Update Balance component styles
walnuts1018 Nov 6, 2023
9e82365
Refactor Balance component and add useCallback to
walnuts1018 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions front/.hintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": [
"development"
],
"hints": {
"no-inline-styles": "off"
}
}
112 changes: 65 additions & 47 deletions front/src/app/mypage/Balance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { useRef } from "react";
import { useSession } from "next-auth/react";
import Picker from "emoji-picker-react";
import { EmojiClickData } from "emoji-picker-react";
import { colors } from "@mui/material";
import Image from "next/image";

const tabColors = ["#f5c33f", "#31aedd"];
Expand Down Expand Up @@ -55,7 +54,8 @@ export function Balance({
const [swiperIndex, setSwiperIndex] = useState(0);
const [isAddMode, setIsAddMode] = useState(false);
const [isAddMode2, setIsAddMode2] = useState(false);
const inputEl = useRef<HTMLInputElement>(null!);
const inputMoneyPoolEmojiElement = useRef<HTMLInputElement>(null!);
const inputMoneyPoolNameElement = useRef<HTMLInputElement>(null!);
const [newMoneyPoolEmoji, setNewMoneyPoolEmoji] = useState("");
const [newMoneyPoolName, setNewMoneyPoolName] = useState("");

Expand All @@ -67,6 +67,10 @@ export function Balance({
const onEmojiClick = (emoji: EmojiClickData, event: MouseEvent) => {
setNewMoneyPoolEmoji(emoji.emoji);
setIsEmojiPicking(false);
if (inputMoneyPoolNameElement.current) {
console.debug("NewMoneyPool, focus to name");
inputMoneyPoolNameElement.current.focus();
}
};

async function addMoneyPool() {
Expand Down Expand Up @@ -193,10 +197,10 @@ export function Balance({
<></>
)}
</Swiper>
<div className="flex justify-center items-center h-16 w-full ">
<div className="flex justify-center items-center h-16 w-full">
{swiperIndex === 0 ? (
<div
className="w-[95%] h-12 cursor-pointer z-50"
className="w-[95%] h-12 cursor-pointer"
onClick={() => {
setIsAddMode(true);
}}
Expand All @@ -218,45 +222,48 @@ export function Balance({
}}
>
<button
type="button"
className="h-5/6"
style={{ color: tabColors[0] }}
tabIndex={0}
onClick={async (e) => {
e.preventDefault();
await addMoneyPool();
}}
title="MoneyPoolを追加"
>
<Plus className="h-full w-full" />
</button>
<div className="w-11/12 flex gap-2 justify-start items-center p-1 relative">
{isEmojiPicking ? (
<div className=" absolute bottom-0">
<Picker onEmojiClick={onEmojiClick} />
</div>
<>
<div className="absolute bottom-0 z-20 bg-white">
<Picker onEmojiClick={onEmojiClick} />
</div>
<div
className="h-screen w-screen fixed left-0 top-0 z-10 bg-transparent"
onClick={() => {
setIsEmojiPicking(false);
}}
/>
</>
) : (
<></>
)}
<input
type="text"
ref={inputEl}
ref={inputMoneyPoolEmojiElement}
className="h-[80%] hover:border-0 focus:outline-none w-[15%] px-0"
onKeyDown={(e) => {
if (e.key === "Enter") {
e.preventDefault();
}
}}
value={newMoneyPoolEmoji}
onClick={(e) => {
defaultValue={newMoneyPoolEmoji}
onClick={() => {
setIsEmojiPicking(true);
}}
onChange={(e) => {
setNewMoneyPoolEmoji(e.target.value);
}}
placeholder="絵文字"
/>
<input
type="text"
className="h-[80%] hover:border-0 focus:outline-none w-[75%]"
ref={inputMoneyPoolNameElement}
onKeyDown={async (e) => {
if (e.key === "Enter") {
if (e.currentTarget) {
Expand Down Expand Up @@ -322,20 +329,21 @@ export function Balance({
}}
>
<button
type="button"
className="h-5/6"
style={{ color: tabColors[1] }}
tabIndex={0}
onClick={async (e) => {
e.preventDefault();
await addMoneyProvider();
}}
title="MoneyProviderを追加"
>
<Plus className="h-full w-full" />
</button>
<div className="w-11/12 flex gap-2 justify-start items-center p-1">
<input
type="text"
ref={inputEl}
className="h-[80%] hover:border-0 focus:outline-none px-0"
onKeyDown={(e) => {
if (e.key === "Enter") {
Expand Down Expand Up @@ -476,9 +484,9 @@ function BalanceItem({
if (res.ok) {
const data = await res.json();
console.log(data);
setMoneyPoolEmoji(newValue);
}
}
setMoneyPoolEmoji(newValue);
}

async function onNameChange(newValue: string) {
Expand Down Expand Up @@ -541,51 +549,55 @@ function BalanceItem({
}

return (
<div className="flex gap-4 font-Noto font-normal py-2 text-4xl items-center justify-between px-0 overflow-hidden border-b-2 border-gray-300">
<div className="flex gap-4 font-Noto font-normal py-2 text-4xl items-center justify-between px-0 border-b-2 border-gray-300">
<div className="w-10 h-10">
{isEditEmoji ? (
<div className="w-full h-full">
<input
ref={inputName}
type="text"
className="w-full"
defaultValue={moneyPoolEmoji}
<>
<div
className="fixed z-20 flex justify-center items-center top-1/3 left-40 shadow-xl rounded-xl"
onBlur={(fe) => {
onEmojiChange(fe.currentTarget.value);
if (!fe.currentTarget.contains(fe.relatedTarget)) {
setIsEditEmoji(false);
}
}}
onKeyDown={(e) => {
if (e.key === "Enter") {
onEmojiChange(e.currentTarget.value);
>
<Picker
onEmojiClick={(emoji) => {
onEmojiChange(emoji.emoji);
setIsEditEmoji(false);
e.currentTarget.blur();
}
}}
/>
</div>
<div
className="h-screen w-screen z-10 fixed bg-transparent left-0 top-0"
onClick={() => {
setIsEditEmoji(false);
}}
autoFocus
tabIndex={0}
/>
</div>
</>
) : (
<div
className="cursor-pointer h-full"
onClick={() => {
setIsEditEmoji((v) => {
return !v;
});
}}
tabIndex={0}
>
{moneyPoolEmoji}
</div>
<></>
)}
<div
className="cursor-pointer h-full"
onClick={() => {
if (!isEditEmoji) {
setIsEditEmoji(() => {
return true;
});
}
}}
tabIndex={0}
>
{moneyPoolEmoji}
</div>
</div>
<div className="flex items-center justify-between w-9/12">
<div className="w-1/2 h-10 min-w-[10px]">
{isEditName ? (
<div className="w-full h-full">
<input
aria-label="money pool name"
ref={inputName}
type="text"
className="w-full"
Expand Down Expand Up @@ -680,6 +692,7 @@ function BalanceItem({
<div>このMoney Poolを公開してもよろしいですか？</div>
<div className="flex justify-between gap-x-8">
<button
type="button"
className="bg-primary-default hover:bg-primary-dark rounded-full text-white px-4 py-1 border-primary-default border-2 hover:border-primary-dark font-Noto font-semibold text-xl"
onClick={() => {
setChangePublicCheckIsOpen(false);
Expand All @@ -692,6 +705,7 @@ function BalanceItem({
公開する
</button>
<button
type="button"
className="bg-white hover:bg-gray-100 rounded-full text-primary-default px-4 py-1 border-primary-default border-2 font-Noto font-semibold text-xl"
onClick={() => setChangePublicCheckIsOpen(false)}
>
Expand All @@ -712,6 +726,7 @@ function BalanceItem({
<div>Money Pool {moneyPool.name} を削除してもよろしいですか？</div>
<div className="flex justify-between gap-x-8">
<button
type="button"
className="bg-primary-default hover:bg-primary-dark rounded-full text-white px-4 py-1 border-primary-default border-2 hover:border-primary-dark font-Noto font-semibold text-xl"
onClick={() => {
setDeleteCheckIsOpen(false);
Expand All @@ -724,6 +739,7 @@ function BalanceItem({
削除する
</button>
<button
type="button"
className="bg-white hover:bg-gray-100 rounded-full text-primary-default px-4 py-1 border-primary-default border-2 font-Noto font-semibold text-xl"
onClick={() => setDeleteCheckIsOpen(false)}
>
Expand Down Expand Up @@ -805,6 +821,7 @@ function MoneyProviderItems({
{isEditProviderName ? (
<div className="w-full h-full">
<input
aria-label="money provider name"
ref={inputProviderName}
type="text"
className="w-full"
Expand Down Expand Up @@ -847,6 +864,7 @@ function MoneyProviderItems({
{isEditBalance ? (
<div className="w-full h-full">
<input
aria-label="money provider balance"
ref={inputBalance}
type="text"
className="w-full"
Expand Down
Loading