@magmamath/students-features 0.2.5 → 0.2.7

package/src/features/feedback/components/TeacherFeedbackComments/TeacherComment.tsx

@@ -1,39 +1,32 @@
 import React from 'react'
-import { View, Text, StyleSheet } from 'react-native'
+import { View, Text, StyleSheet, StyleProp, ViewStyle } from 'react-native'
 import { COLORS } from '@magmamath/react-native-ui'
 import { BUENOS_AIRES_FONT } from '../../constants'
 import { getRelativeTimeText } from '../../../../lib/helpers/helpers'
-import { Locale } from '@magmamath/students-features'
+import { TeacherComment as TeacherCommentEntity } from '../../types'
+import { Locale } from '../../../../shared/translation/types'
 
 type TeacherCommentProps = {
-  content: string
-  teacherName: string
-  createdAt: Date
+  comment: TeacherCommentEntity
   locale: Locale | null
-  isLastComment: boolean
+  style: StyleProp<ViewStyle>
 }
 
-export const TeacherComment = ({
-  content,
-  teacherName,
-  createdAt,
-  locale,
-  isLastComment,
-}: TeacherCommentProps) => {
+export const TeacherComment = ({ comment, locale, style }: TeacherCommentProps) => {
   return (
-    <View style={{ marginBottom: isLastComment ? 8 : 0 }}>
+    <View style={style}>
       <View style={styles.authorInfo}>
         <Text style={styles.teacherName} numberOfLines={1}>
-          {teacherName}
+          {comment.teacherName}
         </Text>
         <View style={styles.spacer} />
         <Text style={styles.dateAdded} numberOfLines={1}>
-          {getRelativeTimeText(createdAt, locale ?? Locale.EN)}
+          {getRelativeTimeText(comment.createdAt, locale ?? Locale.EN)}
         </Text>
       </View>
 
       <View style={styles.container}>
-        <Text style={styles.text}>{content}</Text>
+        <Text style={styles.text}>{comment.content}</Text>
       </View>
     </View>
   )

package/src/features/feedback/components/TeacherFeedbackComments/TeacherFeedbackComments.tsx

@@ -8,19 +8,23 @@ import { Locale } from '../../../../shared/translation'
 import { TeacherComment as TeacherCommentEntity } from '../../types'
 
 const TOOLBAR_HEIGHT = 140
-const BOTTOM_OFFSET = Platform.OS === 'web' ? 270 : 304
-const SIMPLE_MODE_OFFSET = 70
+const BOTTOM_OFFSET = Platform.select({
+  web: 270,
+  default: 304,
+})
 
 type TeacherFeedbackCommentsProps = {
   comments: TeacherCommentEntity[] | null
   locale: Locale | null
   mode: FeedbackMode
+  maxHeightOffset: number
 }
 
 export const TeacherFeedbackComments = ({
   comments,
   locale,
   mode,
+  maxHeightOffset,
 }: TeacherFeedbackCommentsProps) => {
   const ref = useRef<ScrollView | null>(null)
   const dimensions = useWindowDimensions()
@@ -34,12 +38,7 @@ export const TeacherFeedbackComments = ({
   if (!comments) return null
 
   return (
-    <View
-      style={[
-        styles.container,
-        { maxHeight: MAX_HEIGHT - (isSimpleMode ? SIMPLE_MODE_OFFSET : 0) },
-      ]}
-    >
+    <View style={[styles.container, { maxHeight: MAX_HEIGHT - maxHeightOffset }]}>
       <ScrollView
         ref={ref}
         contentContainerStyle={styles.commentsList}
@@ -51,11 +50,9 @@ export const TeacherFeedbackComments = ({
           comments.map((comment, index) => (
             <TeacherComment
               key={comment._id}
-              teacherName={comment.teacherName}
-              content={comment.content}
-              createdAt={comment.createdAt}
+              comment={comment}
               locale={locale}
-              isLastComment={index === comments.length - 1}
+              style={{ marginBottom: index === comments.length - 1 ? 8 : 0 }}
             />
           ))
         )}

package/src/features/feedback/model/comments.ts

@@ -1,5 +1,5 @@
 import { createEvent, restore, sample, Store } from 'effector'
-import { CommentsMap, Credits, FeedbackEntity, NoCommentsMessage, TeacherComment } from '../types'
+import { CommentsMap, Credits, FeedbackEntity, TeacherComment } from '../types'
 import { TeacherFeedbackAPI } from './api'
 import { TeacherFeedbackModelProps } from './model'
 

package/src/features/feedback/model/model.ts

@@ -31,6 +31,9 @@ export class TeacherFeedbackModel {
   public readonly setIsOpen = createEvent<boolean>()
   public readonly $isOpen = restore(this.setIsOpen, false)
 
+  public readonly setIsFeedbackIconDisplayed = createEvent<boolean>()
+  public readonly $isFeedbackIconDisplayed = restore(this.setIsFeedbackIconDisplayed, true)
+
   constructor({ api, socket, credits, defaults }: TeacherFeedbackModelProps) {
     this.api = new TeacherFeedbackAPI(api)
     this.sockets = new TeacherFeedbackSockets(socket)