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.

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

List item comments - removed @fluentUi/react package #983

Merged
merged 21 commits into from
Aug 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ac81c4c
commit chnages new conbtrol listItemComments
joaojmendes Jul 29, 2021
76d66b1
ListItemComments changes Update
joaojmendes Jul 29, 2021
653c416
ListItemComments changes Update
joaojmendes Jul 29, 2021
4681f17
commit changes
joaojmendes Jul 30, 2021
69d223d
Merge branch 'ListItemComments' of https://github.com/joaojmendes/sp-…
joaojmendes Jul 30, 2021
6b0279d
commit chnages on List Item Comments
joaojmendes Jul 30, 2021
3b91378
commit add docs to ListItemComments
joaojmendes Jul 30, 2021
5be1840
Merge remote-tracking branch 'origin/dev' into ListItemComments
joaojmendes Jul 30, 2021
01ead38
commit chnages on listItem comments and control test
joaojmendes Jul 30, 2021
72de177
Update ListItemComments.md
joelfmrodrigues Aug 4, 2021
3b439cd
commit add strings to ListItemComments
joaojmendes Aug 5, 2021
ba9aa3c
Merge branch 'ListItemComments' of https://github.com/joaojmendes/sp-…
joaojmendes Aug 5, 2021
81963a4
Update mystrings.d.ts
joelfmrodrigues Aug 5, 2021
3677719
commit changes on strings ListItemComments
joaojmendes Aug 5, 2021
96c672d
commit chnages ListItemCOmments strings
joaojmendes Aug 5, 2021
a8f3cba
Merge branch 'ListItemComments' of https://github.com/joaojmendes/sp-…
joaojmendes Aug 5, 2021
0b6a414
Update pt-pt.ts
joelfmrodrigues Aug 5, 2021
3cc16fc
Update ru-ru.ts
joelfmrodrigues Aug 5, 2021
5ec9b3b
commit changes remove @fluentui/react
joaojmendes Aug 6, 2021
ed2a172
Merge branch 'ListItemComments' of https://github.com/joaojmendes/sp-…
joaojmendes Aug 6, 2021
4ed66eb
Merge branch 'dev' of https://github.com/joaojmendes/sp-dev-fx-contro…
joaojmendes Aug 6, 2021
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
131 changes: 27 additions & 104 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"prepare": "husky install"
},
"dependencies": {
"@fluentui/react": "^8.23.7",
"@fluentui/react-hooks": "^8.2.6",
"@fluentui/react-northstar": "0.51.3",
"@microsoft/mgt-react": "2.2.0",
"@microsoft/mgt-spfx": "2.2.0",
Expand Down
4 changes: 2 additions & 2 deletions src/controls/listItemComments/ListItemComments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { ServiceScope } from "@microsoft/sp-core-library";
import { AppContext } from "./common";
import { Theme } from "spfx-uifabric-themes"; // Don't remove this import is need to theme load form global var from window object
import { CommentsList } from "./components/Comments/CommentsList";
import { Stack } from "@fluentui/react/lib/Stack";
import { Text } from "@fluentui/react/lib/Text";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import { Text } from "office-ui-fabric-react/lib/Text";
export interface IListItemCommentsProps {
webUrl?: string;
listId: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Stack } from "@fluentui/react/lib/Stack";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import * as React from "react";
import { useContext, useRef, useState } from "react";
import { EListItemCommentsStateTypes, ListItemCommentsStateContext } from "./../ListItemCommentsStateProvider";
Expand All @@ -7,8 +7,8 @@ import { MentionsInput, Mention, SuggestionDataItem, MentionItem } from "react-m
import { useCallback } from "react";
import { useAddCommentStyles } from "./useAddCommentStyles";
import { PHOTO_URL } from "../../common/constants";
import { IconButton } from "@fluentui/react/lib/Button";
import { Text} from "@fluentui/react/lib/Text";
import { IconButton } from "office-ui-fabric-react/lib/Button";
import { Text} from "office-ui-fabric-react/lib/Text";
import { ECommentAction } from "../../common/ECommentAction";
import { IAddCommentPayload } from "../../models/IAddCommentPayload";
import { useMsGraphAPI } from "../..";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from "react";
import { IDocumentCardStyles, IStackStyles, IStyle, mergeStyleSets } from "@fluentui/react";
import { IDocumentCardStyles, IStackStyles, IStyle, mergeStyleSets } from "office-ui-fabric-react";
import { AppContext } from "../../common";

export const useAddCommentStyles = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import * as React from "react";
import { ReactNode, useMemo } from "react";
import format from "date-fns/format";
import parseISO from "date-fns/parseISO";
import { ActivityItem, Link, Text } from "@fluentui/react";
import { Stack } from "@fluentui/react/lib/Stack";
import { ActivityItem, Link, Text } from "office-ui-fabric-react";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import { IComment } from "./IComment";
import { CommentText } from "./CommentText";
import { isEmpty } from "lodash";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from "react";
import { useContext, useEffect, useState } from "react";
import { Mention } from "./IComment";
import { Text } from "@fluentui/react/lib/Text";
import { Text } from "office-ui-fabric-react/lib/Text";
import { LivePersona } from "../../../LivePersona";
import { AppContext } from "../../common";
import regexifyString from "regexify-string";
import { Stack } from "@fluentui/react/lib/Stack";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import { isArray, isObject } from "lodash";
import he from 'he';
export interface ICommentTextProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import { useContext, useEffect, useRef } from "react";
import { Stack } from "@fluentui/react/lib/Stack";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import { useSpAPI } from "../../hooks";
import { EListItemCommentsStateTypes, ListItemCommentsStateContext } from "../ListItemCommentsStateProvider";
import { useListItemCommentsStyles } from "./useListItemCommentsStyles";
Expand All @@ -9,7 +9,7 @@ import { getScrollPosition } from "../../utils/utils";
import { IErrorInfo } from "../ErrorInfo/IErrorInfo";
import { RenderError } from "./RenderError";
import { RenderSpinner } from "./RenderSpinner";
import { Text } from "@fluentui/react/lib/Text";
import { Text } from "office-ui-fabric-react/lib/Text";
import { AddComment } from "../AddComment/AddComment";
import { ECommentAction } from "../../common/ECommentAction";
import { IAddCommentPayload } from "../../models/IAddCommentPayload";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { RenderNoComments } from "./RenderNoComments";
import { RenderSpinner } from "./RenderSpinner";
import { useListItemCommentsStyles } from "./useListItemCommentsStyles";
import { useBoolean } from "@fluentui/react-hooks";
import { List } from "@fluentui/react/lib/List";
import { List } from "office-ui-fabric-react/lib/List";
import { ECommentAction } from "../..";

export interface IRenderCommentsProps {}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Spinner } from "@fluentui/react/lib/Spinner";
import { Spinner } from "office-ui-fabric-react/lib/Spinner";
import { Guid } from "@microsoft/sp-core-library";
import { DocumentCard, DocumentCardDetails } from "office-ui-fabric-react/lib/DocumentCard";
import { SpinnerSize } from "office-ui-fabric-react/lib/Spinner";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
IStyle,
mergeStyles,
mergeStyleSets,
} from "@fluentui/react";
} from "office-ui-fabric-react";
import { AppContext } from "../../common";
import { IScrollablePaneStyles } from "office-ui-fabric-react/lib/ScrollablePane";
import { TILE_HEIGHT } from "../../common/constants";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as React from "react";
import { useContext } from "react";
import { ListItemCommentsStateContext } from "../ListItemCommentsStateProvider";
import { Dialog, DialogType, DialogFooter } from "@fluentui/react/lib/Dialog";
import { PrimaryButton, DefaultButton } from "@fluentui/react/lib/Button";
import { Dialog, DialogType, DialogFooter } from "office-ui-fabric-react/lib/Dialog";
import { PrimaryButton, DefaultButton } from "office-ui-fabric-react/lib/Button";
import { CommentItem } from "../Comments/CommentItem";
import { DocumentCard } from "office-ui-fabric-react/lib/components/DocumentCard";
import { DocumentCardDetails } from "@fluentui/react/lib/DocumentCard";
import { Stack } from "@fluentui/react/lib/Stack";
import { DocumentCardDetails } from "office-ui-fabric-react/lib/DocumentCard";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import { useListItemCommentsStyles } from "../Comments/useListItemCommentsStyles";
import { IDialogContentStyles } from "office-ui-fabric-react";
import strings from "ControlStrings";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import { MessageBar, MessageBarType } from "@fluentui/react/lib/MessageBar";
import { Stack } from "@fluentui/react/lib/Stack";
import { MessageBar, MessageBarType } from "office-ui-fabric-react/lib/MessageBar";
import { Stack } from "office-ui-fabric-react/lib/Stack";
export interface IErrorInfoProps {
error: Error;
showError: boolean;
Expand Down
2 changes: 1 addition & 1 deletion src/webparts/controlsTest/components/TestControl.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { WebPartContext } from "@microsoft/sp-webpart-base";
import { Stack } from "@fluentui/react/lib/Stack";
import { Stack } from "office-ui-fabric-react/lib/Stack";
import * as React from "react";
import { ListItemComments } from "../../../controls/listItemComments";
export interface ITestControlProps {
Expand Down