Skip to content

Исправил ошибку которую выдавала консоль #332

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

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Исправил ошибку которую выдавала консоль #332

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d75519a
Исправил ошибку которую выдавала консоль
brz95 Feb 23, 2023
31ba8e3
Исправил ошибку еще в одном месте
brz95 Feb 23, 2023
760e14e
Добавил компонент CancelLinkLabel для сохранения атрибутов Typography…
brz95 Feb 23, 2023
6074903
fix: wrap CancelLinkLabel with right props
kuduzow Feb 23, 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
35 changes: 28 additions & 7 deletions src/features/questions/create-question/CreateQuestionPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useCallback, useEffect, useRef } from 'react';
import React, { useState, useCallback, useEffect, useRef } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { Link, Redirect } from 'react-router-dom';
import styled from 'styled-components';
Expand All @@ -11,6 +11,7 @@ import { addQuestion } from 'features/questions/questionsSlice';
import { selectProfile } from 'features/profile/profileSlice';
import { useAuth } from 'common/context/Auth/useAuth';
import { MAX_NUMBER_OF_TAGS, TAG_MAX_LENGTH } from 'app/constants';
import PropTypes from 'prop-types';

const StyledQuestionWrapper = styled.div`
& .new-tag {
Expand Down Expand Up @@ -70,6 +71,26 @@ const StyledTagBlock = styled.div`
margin-top: 5px;
`;

const CancelButtonWrapper = styled.span`
cursor: pointer;
`;

const CancelLinkLabel = ({ navigate, href, children }) => {
return (
<CancelButtonWrapper>
<Typography.Text type="secondary" onClick={() => navigate(href)}>
{children}
</Typography.Text>
</CancelButtonWrapper>
);
};

CancelLinkLabel.propTypes = {
navigate: PropTypes.func.isRequired,
href: PropTypes.string.isRequired,
children: PropTypes.node.isRequired,
};

const CreateQuestion = () => {
const dispatch = useDispatch();
const editorRef = useRef();
Expand Down Expand Up @@ -156,8 +177,8 @@ const CreateQuestion = () => {
<div className="container m-3 m-md-auto">
<div className="d-flex justify-content-between my-3">
<h3>Добавление вопроса</h3>
<Link to="/">
<Typography.Link>Вернуться назад</Typography.Link>
<Link to="/" component={Typography.Link}>
Вернуться назад
</Link>
</div>
</div>
Expand Down Expand Up @@ -217,8 +238,8 @@ const CreateQuestion = () => {

<div className="d-flex flex-wrap">
{tags.map((tag) => (
<StyledTagBlock>
<Tag key={tag} closable onClose={() => removeTag(tag)}>
<StyledTagBlock key={tag}>
<Tag closable onClose={() => removeTag(tag)}>
{tag}
</Tag>
</StyledTagBlock>
Expand Down Expand Up @@ -260,8 +281,8 @@ const CreateQuestion = () => {
</Button>
</div>
<div className="col-auto">
<Link to="/" className="cancel">
<Typography.Text type="secondary">Отмена</Typography.Text>
<Link to="/" component={CancelLinkLabel}>
Отмена
</Link>
</div>
</div>
Expand Down