catchup-library-web 2.2.7 → 2.2.9

package/dist/index.js

@@ -4188,7 +4188,9 @@ var InputGroup = ({
               value,
               onChange: handleTextOnChange,
               onFocus,
-              onKeyDown
+              onKeyDown,
+              min: minValue,
+              max: maxValue
             }
           )
         }
@@ -7199,23 +7201,30 @@ var ActivityEvaluationRubricContent = ({
     Object.keys(evaluationRubricMap).map((key, index) => {
       const currentItem = JSON.parse(evaluationRubricMap[key]);
       const { value } = currentItem;
-      return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
-        "p",
-        {
-          className: "my-1 text-xl whitespace-pre-wrap",
-          children: constructInputWithSpecialExpressionList(value).map(
-            (inputPart, index2) => /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
-              "span",
-              {
-                className: `${inputPart.isBold ? "font-bold" : ""} ${inputPart.isUnderline ? "underline" : ""}`,
-                children: inputPart.isEquation ? /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("span", { className: "text-xl", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_react_katex12.InlineMath, { math: inputPart.value }) }) : inputPart.value
-              },
-              index2
-            )
+      const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
+      let score = 0;
+      let evaluationRubric = value;
+      if (matchedRegex) {
+        score = parseFloat(matchedRegex[1]);
+        evaluationRubric = matchedRegex[2];
+      }
+      return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "my-2 flex flex-row gap-x-3", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "font-bold text-xl whitespace-nowrap", children: [
+          score,
+          " ",
+          i18n_default.t("points")
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("p", { className: "flex-1 text-xl whitespace-pre-wrap", children: constructInputWithSpecialExpressionList(evaluationRubric).map(
+          (inputPart, inputIndex) => /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+            "span",
+            {
+              className: `${inputPart.isBold ? "font-bold" : ""} ${inputPart.isUnderline ? "underline" : ""}`,
+              children: inputPart.isEquation ? /* @__PURE__ */ (0, import_jsx_runtime45.jsx)("span", { className: "text-xl", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_react_katex12.InlineMath, { math: inputPart.value }) }) : inputPart.value
+            },
+            inputIndex
           )
-        },
-        `${key}_${index}`
-      );
+        ) })
+      ] }, `${key}_${index}`);
     })
   ] }) });
 };

package/dist/index.mjs

@@ -3965,7 +3965,9 @@ var InputGroup = ({
               value,
               onChange: handleTextOnChange,
               onFocus,
-              onKeyDown
+              onKeyDown,
+              min: minValue,
+              max: maxValue
             }
           )
         }
@@ -6976,23 +6978,30 @@ var ActivityEvaluationRubricContent = ({
     Object.keys(evaluationRubricMap).map((key, index) => {
       const currentItem = JSON.parse(evaluationRubricMap[key]);
       const { value } = currentItem;
-      return /* @__PURE__ */ jsx45(
-        "p",
-        {
-          className: "my-1 text-xl whitespace-pre-wrap",
-          children: constructInputWithSpecialExpressionList(value).map(
-            (inputPart, index2) => /* @__PURE__ */ jsx45(
-              "span",
-              {
-                className: `${inputPart.isBold ? "font-bold" : ""} ${inputPart.isUnderline ? "underline" : ""}`,
-                children: inputPart.isEquation ? /* @__PURE__ */ jsx45("span", { className: "text-xl", children: /* @__PURE__ */ jsx45(InlineMath12, { math: inputPart.value }) }) : inputPart.value
-              },
-              index2
-            )
+      const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
+      let score = 0;
+      let evaluationRubric = value;
+      if (matchedRegex) {
+        score = parseFloat(matchedRegex[1]);
+        evaluationRubric = matchedRegex[2];
+      }
+      return /* @__PURE__ */ jsxs34("div", { className: "my-2 flex flex-row gap-x-3", children: [
+        /* @__PURE__ */ jsxs34("div", { className: "font-bold text-xl whitespace-nowrap", children: [
+          score,
+          " ",
+          i18n_default.t("points")
+        ] }),
+        /* @__PURE__ */ jsx45("p", { className: "flex-1 text-xl whitespace-pre-wrap", children: constructInputWithSpecialExpressionList(evaluationRubric).map(
+          (inputPart, inputIndex) => /* @__PURE__ */ jsx45(
+            "span",
+            {
+              className: `${inputPart.isBold ? "font-bold" : ""} ${inputPart.isUnderline ? "underline" : ""}`,
+              children: inputPart.isEquation ? /* @__PURE__ */ jsx45("span", { className: "text-xl", children: /* @__PURE__ */ jsx45(InlineMath12, { math: inputPart.value }) }) : inputPart.value
+            },
+            inputIndex
           )
-        },
-        `${key}_${index}`
-      );
+        ) })
+      ] }, `${key}_${index}`);
     })
   ] }) });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catchup-library-web",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/components/activities/evaluation-rubric-contents/ActivityEvaluationRubricContent.tsx

@@ -44,30 +44,41 @@ const ActivityEvaluationRubricContent = ({
         {Object.keys(evaluationRubricMap).map((key, index) => {
           const currentItem = JSON.parse(evaluationRubricMap[key]);
           const { value } = currentItem;
+          const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
+          let score = 0;
+          let evaluationRubric = value;
+
+          if (matchedRegex) {
+            score = parseFloat(matchedRegex[1]);
+            evaluationRubric = matchedRegex[2];
+          }
+
           return (
-            <p
-              key={`${key}_${index}`}
-              className="my-1 text-xl whitespace-pre-wrap"
-            >
-              {constructInputWithSpecialExpressionList(value).map(
-                (inputPart, index) => (
-                  <span
-                    key={index}
-                    className={`${inputPart.isBold ? "font-bold" : ""} ${
-                      inputPart.isUnderline ? "underline" : ""
-                    }`}
-                  >
-                    {inputPart.isEquation ? (
-                      <span className="text-xl">
-                        <InlineMath math={inputPart.value} />
-                      </span>
-                    ) : (
-                      inputPart.value
-                    )}
-                  </span>
-                )
-              )}
-            </p>
+            <div key={`${key}_${index}`} className="my-2 flex flex-row gap-x-3">
+              <div className="font-bold text-xl whitespace-nowrap">
+                {score} {i18n.t("points")}
+              </div>
+              <p className="flex-1 text-xl whitespace-pre-wrap">
+                {constructInputWithSpecialExpressionList(evaluationRubric).map(
+                  (inputPart, inputIndex) => (
+                    <span
+                      key={inputIndex}
+                      className={`${inputPart.isBold ? "font-bold" : ""} ${
+                        inputPart.isUnderline ? "underline" : ""
+                      }`}
+                    >
+                      {inputPart.isEquation ? (
+                        <span className="text-xl">
+                          <InlineMath math={inputPart.value} />
+                        </span>
+                      ) : (
+                        inputPart.value
+                      )}
+                    </span>
+                  )
+                )}
+              </p>
+            </div>
           );
         })}
       </div>

package/src/components/groups/InputGroup.tsx

@@ -505,6 +505,8 @@ const InputGroup = ({
             onChange={handleTextOnChange}
             onFocus={onFocus}
             onKeyDown={onKeyDown}
+            min={minValue}
+            max={maxValue}
           />
         </div>